Changeset 34060 in vbox for trunk

Timestamp:

Nov 14, 2010 11:15:04 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67742

Message:

some tar bits

Location:

trunk/src/VBox/Runtime/common/zip

Files:

• tar.h (modified) (3 diffs)
• tarvfs.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/zip/tar.h

@@ -105 +105 @@
 
 /**
+ * The GNU header.
+ */
+typedef struct RTZIPTARHDRGNU
+{
+    char    name[100];
+    char    mode[8];
+    char    uid[8];
+    char    gid[8];
+    char    size[12];
+    char    mtime[12];
+    char    chksum[8];
+    char    typeflag;
+    char    linkname[100];
+    char    magic[8];
+    char    uname[32];
+    char    gname[32];
+    char    devmajor[8];
+    char    devminor[8];
+    char    atime[12];
+    char    ctime[12];
+    char    offset[12];
+    char    longnames[4];
+    char    unused[1];
+    struct
+    {
+        char offset[12];
+        char numbytes[12];
+    }       sparse[4];
+    char    isextended;
+    char    realsize[12];
+    char    unused2[17];
+} RTZIPTARHDRGNU;
+AssertCompileSize(RTZIPTARHDRGNU, 512);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, name,        0);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, mode,      100);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, uid,       108);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, gid,       116);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, size,      124);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, mtime,     136);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, chksum,    148);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, typeflag,  156);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, linkname,  157);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, magic,     257);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, uname,     265);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, gname,     297);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, devmajor,  329);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, devminor,  337);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, atime,     345);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, ctime,     357);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, offset,    369);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, longnames, 381);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, unused,    385);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, sparse,    386);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, isextended,482);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, realsize,  483);
+AssertCompileMemberOffset(RTZIPTARHDRGNU, unused2,   495);
+
+
+/**
  * Tar header union.
  */
@@ -110 +169 @@
 {
     /** Byte view. */
-    char            ab[512];
+    char                ab[512];
     /** The standard header. */
-    RTZIPTARHDRPOSIX Posix;
+    RTZIPTARHDRPOSIX    Posix;
+    /** The GNU header. */
+    RTZIPTARHDRGNU      Gnu;
 } RTZIPTARHDR;
 AssertCompileSize(RTZIPTARHDR, 512);
@@ -120 +181 @@
 typedef RTZIPTARHDR const *PCRTZIPTARHDR;
 
+
+/**
+ * Tar header type.
+ */
+typedef enum RTZIPTARTYPE
+{
+    /** Invalid type value. */
+    RTZIPTARTYPE_INVALID = 0,
+    /** Posix header.  */
+    RTZIPTARTYPE_POSIX,
+    /** The old GNU header, has layout conflicting with posix. */
+    RTZIPTARTYPE_GNU,
+    /** Ancient tar header which does not use anything beyond the magic. */
+    RTZIPTARTYPE_ANCIENT,
+    /** End of the valid type values (this is not valid).  */
+    RTZIPTARTYPE_END,
+    /** The usual type blow up.  */
+    RTZIPTARTYPE_32BIT_HACK = 0x7fffffff
+} RTZIPTARTYPE;
+typedef RTZIPTARTYPE *PRTZIPTARTYPE;
+
+
 #endif
 

trunk/src/VBox/Runtime/common/zip/tarvfs.cpp

@@ -306 +306 @@
  * @returns VINF_SUCCESS if valid, appropriate VERR_TAR_XXX if not.
  * @param   pTar                The TAR header.
- */
-static int rtZipTarHdrValidate(PCRTZIPTARHDR pTar)
+ * @param   penmType            Where to return the type of header on success.
+ */
+static int rtZipTarHdrValidate(PCRTZIPTARHDR pTar, PRTZIPTARTYPE penmType)
 {
     /*
@@ -325 +326 @@
         return VERR_TAR_BAD_CHKSUM_FIELD;
     if (   i32ChkSum          != i64HdrChkSum
-        && i32ChkSumSignedAlt != i64HdrChkSum) /** @todo check this */
+        && i32ChkSumSignedAlt != i64HdrChkSum) /** @todo test this */
         return VERR_TAR_CHKSUM_MISMATCH;
 
     /*
+     * Detect the tar type.
+     */
+    RTZIPTARTYPE enmType;
+    if (   pTar->Posix.magic[0] == 'u'
+        && pTar->Posix.magic[1] == 's'
+        && pTar->Posix.magic[2] == 't'
+        && pTar->Posix.magic[3] == 'a'
+        && pTar->Posix.magic[4] == 'r')
+    {
+        if (   pTar->Posix.magic[5]   == '\0'
+            && pTar->Posix.version[0] == '0'
+            && pTar->Posix.version[1] == '0')
+            enmType = RTZIPTARTYPE_POSIX;
+        else if (   pTar->Posix.magic[5]   == ' '
+                && pTar->Posix.version[0] == ' '
+                && pTar->Posix.version[1] == '\0')
+            enmType = RTZIPTARTYPE_GNU;
+        else
+            return VERR_TAR_NOT_USTAR_V00;
+    }
+    else
+        enmType = RTZIPTARTYPE_ANCIENT;
+    *penmType = enmType;
+
+    /*
      * Perform some basic checks.
      */
-    if (!rtZipTarHdrIsUstar(pTar))
-    {
-RTAssertMsg2("%.6s%c%c\n", pTar->Posix.magic, pTar->Posix.version[0], pTar->Posix.version[1]);
-RTAssertMsg2("%.8Rhxs\n", pTar->Posix.magic);
-        return VERR_TAR_NOT_USTAR_V00;
-    }
-
+    /** @todo more/less? */
     switch (pTar->Posix.typeflag)
     {
@@ -352 +372 @@
                 return VERR_TAR_EMPTY_NAME;
 
+            /** @todo People claim some (older and newer buggy) tar stores dirs as regular files with a trailing slash. */
             const char *pchEnd = RTStrEnd(&pTar->Posix.name[0], sizeof(pTar->Posix.name));
             pchEnd = pchEnd ? pchEnd - 1 : &pTar->Posix.name[sizeof(pTar->Posix.name) - 1];
@@ -379 +400 @@
             return VERR_TAR_UNSUPPORTED_GNU_HDR_TYPE;
     }
+
 
     return VINF_SUCCESS;
@@ -982 +1004 @@
      * We pick up the start of the zero headers here in the failure path.
      */
-    rc = rtZipTarHdrValidate(&Hdr);
+    RTZIPTARTYPE enmTarType;
+    rc = rtZipTarHdrValidate(&Hdr, &enmTarType);
     if (RT_FAILURE_NP(rc))
     {