Changeset 34045 in vbox for trunk/src/VBox

Timestamp:

Nov 12, 2010 7:16:09 PM (14 years ago)

Author:

vboxsync

Message:

iprt: more tar code and vfs filesystem stream bugfixes.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/vfs/vfsbase.cpp (modified) (1 diff)
• common/vfs/vfsstdfile.cpp (modified) (1 diff)
• common/zip/tarcmd.cpp (added)
• common/zip/tarvfs.cpp (modified) (10 diffs)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/RTTar.cpp (added)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -372 +372 @@
         common/vfs/vfsstdfile.cpp \
         common/zip/tar.cpp \
+        common/zip/tarcmd.cpp \
         common/zip/tarvfs.cpp \
         common/zip/gzipvfs.cpp \

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -1597 +1597 @@
     RTVFSFSSTREAMINTERNAL *pThis = hVfsFss;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
-    AssertReturn(pThis->uMagic == RTVFSDIR_MAGIC, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->uMagic == RTVFSFSSTREAM_MAGIC, VERR_INVALID_HANDLE);
     AssertPtrNullReturn(ppszName, VERR_INVALID_POINTER);
     if (ppszName)

trunk/src/VBox/Runtime/common/vfs/vfsstdfile.cpp

@@ -284 +284 @@
 {
     PRTVFSSTDFILE pThis = (PRTVFSSTDFILE)pvThis;
-    return RTFileTell(pThis->hFile);
+    uint64_t offActual;
+    int rc = RTFileSeek(pThis->hFile, 0, RTFILE_SEEK_CURRENT, &offActual);
+    if (RT_SUCCESS(rc))
+        *poffActual = (RTFOFF)offActual;
+    return rc;
 }
 

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

@@ -32 +32 @@
 #include <iprt/zip.h>
 
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
@@ -144 +145 @@
 DECLINLINE(bool) rtZipTarHdrHasPrefix(PCRTZIPTARHDR pTar)
 {
-    return true;
+    return pTar->Posix.prefix[0] != '\0';
 }
 
@@ -157 +158 @@
 {
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Converts a numeric header field to the C native type.
+ *
+ * @returns IPRT status code.
+ *
+ * @param   pszField            The TAR header field.
+ * @param   cchField            The length of the field.
+ * @param   fOctalOnly          Must be octal.
+ * @param   pi64                Where to store the value.
+ */
+static int rtZipTarHdrFieldToNum(const char *pszField, size_t cchField, bool fOctalOnly, int64_t *pi64)
+{
+    /** @todo check for base256 and more  */
+    return RTStrToInt64Full(pszField, 8, pi64);
 }
 
@@ -171 +189 @@
 {
     RT_ZERO(*pObjInfo);
+    int rc;
+
+    int64_t i64;
+    rc = rtZipTarHdrFieldToNum(pTar->Posix.size, sizeof(pTar->Posix.size), false, &i64);
+    AssertRCSuccessReturn(rc, rc);
+    pObjInfo->cbObject = i64;
+
+    pObjInfo->Attr.enmAdditional = RTFSOBJATTRADD_UNIX;
 
     return VINF_SUCCESS;
@@ -267 +293 @@
 {
     PRTZIPTARIOSTREAM pThis = (PRTZIPTARIOSTREAM)pvThis;
+
+    RTVfsIoStrmRelease(pThis->hVfsIos);
+    pThis->hVfsIos = NIL_RTVFSIOSTREAM;
+
     return rtZipTarFssBaseObj_Close(&pThis->BaseObj);
 }
@@ -602 +632 @@
            && off < pThis->offNextHdr)
     {
-        int rc = RTVfsIoStrmSkip(pThis->hVfsIos, off - pThis->offNextHdr);
+        int rc = RTVfsIoStrmSkip(pThis->hVfsIos, pThis->offNextHdr - off);
         if (RT_FAILURE(rc))
         {
@@ -637 +667 @@
     /*
      * Validate the header and convert to binary object info.
-     */
-/** @todo look for the two all zero headers terminating the stream... */
+     * We pick up the two zero headers in the failure path here.
+     */
     rc = rtZipTarHdrValidate(&Hdr);
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE_NP(rc))
+    {
+        if (ASMMemIsAllU32(&Hdr, sizeof(Hdr), 0) == NULL)
+        {
+            int rc2 = RTVfsIoStrmRead(pThis->hVfsIos, &Hdr, sizeof(Hdr), true /*fBlocking*/, &cbRead);
+            if (RT_FAILURE(rc2))
+                return pThis->rcFatal = rc2;
+            if (ASMMemIsAllU32(&Hdr, sizeof(Hdr), 0) == NULL)
+            {
+                pThis->fEndOfStream = true;
+                if (RTVfsIoStrmIsAtEnd(pThis->hVfsIos))
+                    return VERR_EOF;
+                return VERR_TAR_EOS_MORE_INPUT;
+            }
+        }
+
         return pThis->rcFatal = rc;
+    }
 
     RTFSOBJINFO Info;
@@ -764 +810 @@
         {
             *ppszName = NULL;
-            rc = RTStrAAppendExN(ppszName, 2, Hdr.Posix.prefix, Hdr.Posix.name);
+            rc = RTStrAAppendExN(ppszName, 3,
+                                 Hdr.Posix.prefix, sizeof(Hdr.Posix.prefix),
+                                 "/", 1,
+                                 Hdr.Posix.name, sizeof(Hdr.Posix.name));
         }
         else
-            rc = RTStrDupEx(ppszName, Hdr.Posix.name);
+        {
+            *ppszName = RTStrDupN(Hdr.Posix.name, sizeof(Hdr.Posix.name));
+            rc = *ppszName ? VINF_SUCCESS : VERR_NO_STR_MEMORY;
+        }
         if (RT_FAILURE(rc))
             return rc;
@@ -806 +858 @@
 
 
-RTDECL(int) RTZipTarFsStreamFromIoStream(RTVFSIOSTREAM hVfsIosIn, PRTVFSFSSTREAM phVfsFss)
+RTDECL(int) RTZipTarFsStreamFromIoStream(RTVFSIOSTREAM hVfsIosIn, uint32_t fFlags, PRTVFSFSSTREAM phVfsFss)
 {
     /*
@@ -814 +866 @@
     *phVfsFss = NIL_RTVFSFSSTREAM;
     AssertPtrReturn(hVfsIosIn, VERR_INVALID_HANDLE);
+    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
     RTFOFF const offStart = RTVfsIoStrmTell(hVfsIosIn);

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -577 +577 @@
 RTGzip_SOURCES = RTGzip.cpp
 
+# RTTar - our tar clone (for testing the tar/gzip/gunzip streaming code)
+PROGRAMS += RTTar
+RTTar_TEMPLATE = VBOXR3TSTEXE
+RTTar_SOURCES = RTTar.cpp