Changeset 34052 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Nov 13, 2010 1:29:03 PM (14 years ago)

Author:

vboxsync

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

67734

Message:

tar: fixed bugs, listing output is identical to gnutar (when using --utc).

Location:

trunk/src/VBox/Runtime/common/zip

Files:

• tarcmd.cpp (modified) (9 diffs)
• tarvfs.cpp (modified) (5 diffs)

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

@@ -51 +51 @@
 #define RTZIPTARCMD_OPT_OWNER       1001
 #define RTZIPTARCMD_OPT_GROUP       1002
-#define RTZIPTARCMD_OPT_PREFIX      1003
+#define RTZIPTARCMD_OPT_UTC         1003
+#define RTZIPTARCMD_OPT_PREFIX      1004
 
 
@@ -86 +87 @@
     /** The group ID to set when unpacking if pszGroup is not NULL. */
     RTGID           gidGroup;
+    /** Display the modification times in UTC instead of local time. */
+    bool            fDisplayUtc;
 
     /** What to prefix all names with when creating, adding, whatever. */
@@ -229 +232 @@
  * @param   hVfsObj             The tar object to display
  * @param   pszName             The name.
+ * @param   pOpts               The tar options.
  */
-static RTEXITCODE rtZipTarCmdDisplayEntryVerbose(RTEXITCODE rcExit, RTVFSOBJ hVfsObj, const char *pszName)
+static RTEXITCODE rtZipTarCmdDisplayEntryVerbose(RTEXITCODE rcExit, RTVFSOBJ hVfsObj, const char *pszName,
+                                                 PRTZIPTARCMDOPS pOpts)
 {
     /*
@@ -309 +314 @@
      * Format the modification time.
      */
-    char szModTime[32];
-    RTTIME ModTime;
-    if (RTTimeExplode(&ModTime, &UnixInfo.ModificationTime) == NULL)
+    char       szModTime[32];
+    RTTIME     ModTime;
+    PRTTIME    pTime;
+    if (!pOpts->fDisplayUtc)
+        pTime = RTTimeLocalExplode(&ModTime, &UnixInfo.ModificationTime);
+    else
+        pTime = RTTimeExplode(&ModTime, &UnixInfo.ModificationTime);
+    if (!pTime)
         RT_ZERO(ModTime);
     RTStrPrintf(szModTime, sizeof(szModTime), "%04d-%02u-%02u %02u:%02u",
@@ -326 +336 @@
                         + 1
                         + strlen(Group.Attr.u.UnixGroup.szName);
-    ssize_t cchPad = cchUserGroup + cchSize + 1 < 18
-                   ? 18 - (cchUserGroup + cchSize + 1)
+    ssize_t cchPad = cchUserGroup + cchSize + 1 < 19
+                   ? 19 - (cchUserGroup + cchSize + 1)
                    : 0;
 
@@ -403 +413 @@
                     RTPrintf("%s\n", pszName);
                 else
-                    rcExit = rtZipTarCmdDisplayEntryVerbose(rcExit, hVfsObj, pszName);
+                    rcExit = rtZipTarCmdDisplayEntryVerbose(rcExit, hVfsObj, pszName, pOpts);
             }
 
@@ -466 +476 @@
         { "--owner",                RTZIPTARCMD_OPT_OWNER, RTGETOPT_REQ_STRING },
         { "--group",                RTZIPTARCMD_OPT_GROUP, RTGETOPT_REQ_STRING },
+        { "--utc",                  RTZIPTARCMD_OPT_UTC,  RTGETOPT_REQ_NOTHING },
 
         /* IPRT extensions */
@@ -516 +527 @@
 
             case 'v':
-                Opts.fVerbose = false;
+                Opts.fVerbose = true;
                 break;
 
@@ -542 +553 @@
                 break;
 
+            case RTZIPTARCMD_OPT_UTC:
+                Opts.fDisplayUtc = true;
+                break;
 
             /* iprt extensions */

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

@@ -289 +289 @@
         i32Unsigned -= *(unsigned char *)pch;
         i32Signed   -= *(signed   char *)pch;
-        pch++;
     } while (++pch != pchEnd);
 
@@ -325 +324 @@
     if (RT_FAILURE(rc))
         return VERR_TAR_BAD_CHKSUM_FIELD;
-//    if (   i32ChkSum          != i64HdrChkSum
-//        && i32ChkSumSignedAlt != i64HdrChkSum) /** @todo check this */
-//        return VERR_TAR_CHKSUM_MISMATCH;
+    if (   i32ChkSum          != i64HdrChkSum
+        && i32ChkSumSignedAlt != i64HdrChkSum) /** @todo check this */
+        return VERR_TAR_CHKSUM_MISMATCH;
 
     /*
@@ -977 +976 @@
     /*
      * Validate the header and convert to binary object info.
-     * We pick up the two zero headers in the failure path here.
+     * We pick up the start of the zero headers here in the failure path.
      */
     rc = rtZipTarHdrValidate(&Hdr);
@@ -992 +991 @@
                 if (RTVfsIoStrmIsAtEnd(pThis->hVfsIos))
                     return VERR_EOF;
-                return VERR_TAR_EOS_MORE_INPUT;
+
+                /* Just drain the stream because blocksize may dictate that
+                   there is a whole bunch of stuff comming up. */
+                for (uint32_t i = 0; i < _32K / 512; i++)
+                {
+                    rc = RTVfsIoStrmRead(pThis->hVfsIos, &Hdr, sizeof(Hdr), true /*fBlocking*/, &cbRead);
+                    if (rc == VINF_EOF)
+                        return VERR_EOF;
+                    if (RT_FAILURE(rc))
+                        break;
+                    Assert(cbRead == sizeof(Hdr));
+                }
             }
         }
@@ -1035 +1045 @@
             pIosData->cbFile          = Info.cbObject;
             pIosData->offFile         = 0;
-            pIosData->cbPadding       = 512 - (uint32_t)(Info.cbObject % 512);
+            pIosData->cbPadding       = Info.cbAllocated - Info.cbObject;
             pIosData->fEndOfStream    = false;
             pIosData->hVfsIos         = pThis->hVfsIos;