Changeset 51696 in vbox

Timestamp:

Jun 23, 2014 4:30:29 PM (10 years ago)

Author:

vboxsync

Message:

Runtime: PKZip stream reader

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/zip.h (modified) (4 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/zip/pkzipvfs.cpp (added)
• src/VBox/Runtime/common/zip/unzipcmd.cpp (added)
• src/VBox/Runtime/common/zip/zip.cpp (modified) (7 diffs)
• src/VBox/Runtime/tools/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/tools/RTUnzip.cpp (copied) (copied from trunk/src/VBox/Runtime/tools/RTTar.cpp ) (1 diff)

trunk/include/iprt/err.h

@@ -1712 +1712 @@
 /** @} */
 
+/** @name Pkzip status codes
+ * @{ */
+/** No end of central directory record found. */
+#define VERR_PKZIP_NO_EOCB                      (-960)
+/** Too long name string. */
+#define VERR_PKZIP_NAME_TOO_LONG                (-961)
+/** Local file header corrupt. */
+#define VERR_PKZIP_BAD_LF_HEADER                (-962)
+/** Central directory file header corrupt. */
+#define VERR_PKZIP_BAD_CDF_HEADER               (-963)
+/** Encountered an unknown type flag. */
+#define VERR_PKZIP_UNKNOWN_TYPE_FLAG            (-964)
+/** Found a ZIP64 Extra Information Field in a ZIP32 file. */
+#define VERR_PKZIP_ZIP64EX_IN_ZIP32             (-965)
+
+
 /** @name RTZip status codes
  * @{ */

trunk/include/iprt/mangling.h

@@ -1903 +1903 @@
 # define RTZipGzipDecompressIoStream                    RT_MANGLER(RTZipGzipDecompressIoStream)
 # define RTZipTarCmd                                    RT_MANGLER(RTZipTarCmd)
+# define RTZipUnzipCmd                                  RT_MANGLER(RTZipUnzipCmd)
 # define RTZipTarFsStreamFromIoStream                   RT_MANGLER(RTZipTarFsStreamFromIoStream)
 # define RTZipXarFsStreamFromIoStream                   RT_MANGLER(RTZipXarFsStreamFromIoStream)
+# define RTZipPkzipFsStreamFromIoStream                 RT_MANGLER(RTZipPkzipFsStreamFromIoStream)
 /*
  * Stable variables (alphabetical order):

trunk/include/iprt/zip.h

@@ -86 +86 @@
     /** Lempel-Ziv-Oberhumer compression. */
     RTZIPTYPE_LZO,
+    /* Zlib compression the data without zlib header. */
+    RTZIPTYPE_ZLIB_NO_HEADER,
     /** End of valid the valid compression types.  */
     RTZIPTYPE_END
@@ -217 +219 @@
 
 /**
+ * Opens a zip decompression I/O stream.
+ *
+ * @returns IPRT status code.
+ *
+ * @param   hVfsIosIn           The compressed input stream (must be readable).
+ *                              The reference is not consumed, instead another
+ *                              one is retained.
+ * @param   fFlags              Flags, MBZ.
+ * @param   phVfsIosUnzip       Where to return the handle to the gunzipped I/O
+ *                              stream (read).
+ */
+RTDECL(int) RTZipDecompressIoStream(RTVFSIOSTREAM hVfsIosIn, uint32_t fFlags, PRTVFSIOSTREAM phVfsIosUnzip);
+
+
+/**
  * Opens a gzip decompression I/O stream.
  *
@@ -279 +296 @@
 
 /**
- * Opens a XAR filesystem stream.
- *
- * This is used to extract, list or check a XAR archive.
+ * Opens a ZIP filesystem stream.
+ *
+ * This is used to extract, list or check a ZIP archive.
  *
  * @returns IPRT status code.
@@ -288 +305 @@
  *                              not consumed, instead another one is retained.
  * @param   fFlags              Flags, MBZ.
+ * @param   phVfsFss            Where to return the handle to the TAR
+ *                              filesystem stream.
+ */
+RTDECL(int) RTZipPkzipFsStreamFromIoStream(RTVFSIOSTREAM hVfsIosIn, uint32_t fFlags, PRTVFSFSSTREAM phVfsFss);
+
+/**
+ * A mini UNZIP program.
+ *
+ * @returns Program exit code.
+ * @
+ * @param   cArgs               The number of arguments.
+ * @param   papszArgs           The argument vector.  (Note that this may be
+ *                              reordered, so the memory must be writable.)
+ */
+RTDECL(RTEXITCODE) RTZipUnzipCmd(unsigned cArgs, char **papszArgs);
+
+/**
+ * Opens a XAR filesystem stream.
+ *
+ * This is used to extract, list or check a XAR archive.
+ *
+ * @returns IPRT status code.
+ *
+ * @param   hVfsIosIn           The compressed input stream.  The reference is
+ *                              not consumed, instead another one is retained.
+ * @param   fFlags              Flags, MBZ.
  * @param   phVfsFss            Where to return the handle to the XAR filesystem
  *                              stream.

trunk/src/VBox/Runtime/Makefile.kmk

@@ -464 +464 @@
         common/zip/tar.cpp \
         common/zip/tarcmd.cpp \
+        common/zip/unzipcmd.cpp \
         common/zip/tarvfs.cpp \
         common/zip/gzipvfs.cpp \
+        common/zip/pkzipvfs.cpp \
         common/zip/zip.cpp \
         generic/createtemp-generic.cpp \

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

@@ -420 +420 @@
 
 #ifdef RTZIP_USE_ZLIB
+
+/*
+ * Missing definitions from zutil.h. We need these constants for calling
+ * inflateInit2() / deflateInit2().
+ */
+# ifndef Z_DEF_WBITS
+#  define Z_DEF_WBITS        MAX_WBITS
+# endif
+# ifndef Z_DEF_MEM_LEVEL
+#  define Z_DEF_MEM_LEVEL    8
+# endif
+
 /**
  * Convert from zlib errno to iprt status code.
@@ -543 +555 @@
  * @param   pZip        The compressor instance.
  * @param   enmLevel    The desired compression level.
- */
-static DECLCALLBACK(int) rtZipZlibCompInit(PRTZIPCOMP pZip, RTZIPLEVEL enmLevel)
+ * @param   fZlibHeader If true, write the Zlib header.
+ */
+static DECLCALLBACK(int) rtZipZlibCompInit(PRTZIPCOMP pZip, RTZIPLEVEL enmLevel, bool fZlibHeader)
 {
     pZip->pfnCompress = rtZipZlibCompress;
@@ -564 +577 @@
     pZip->u.Zlib.opaque    = pZip;
 
-    int rc = deflateInit(&pZip->u.Zlib, iLevel);
+    int rc = deflateInit2(&pZip->u.Zlib, iLevel, Z_DEFLATED, fZlibHeader ? Z_DEF_WBITS : -Z_DEF_WBITS,
+                          Z_DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
     return rc >= 0 ? rc = VINF_SUCCESS : zipErrConvertFromZlib(rc, true /*fCompressing*/);
 }
@@ -636 +650 @@
  * @returns iprt status code.
  * @param   pZip        The decompressor instance.
- */
-static DECLCALLBACK(int) rtZipZlibDecompInit(PRTZIPDECOMP pZip)
+ * @param   fZlibHeader If true, expect the Zlib header.
+ */
+static DECLCALLBACK(int) rtZipZlibDecompInit(PRTZIPDECOMP pZip, bool fZlibHeader)
 {
     pZip->pfnDecompress = rtZipZlibDecompress;
@@ -645 +660 @@
     pZip->u.Zlib.opaque    = pZip;
 
-    int rc = inflateInit(&pZip->u.Zlib);
+    int rc = inflateInit2(&pZip->u.Zlib, fZlibHeader ? Z_DEF_WBITS : -Z_DEF_WBITS);
     return rc >= 0 ? VINF_SUCCESS : zipErrConvertFromZlib(rc, false /*fCompressing*/);
 }
@@ -1406 +1421 @@
 
         case RTZIPTYPE_ZLIB:
+        case RTZIPTYPE_ZLIB_NO_HEADER:
 #ifdef RTZIP_USE_ZLIB
-            rc = rtZipZlibCompInit(pZip, enmLevel);
+            rc = rtZipZlibCompInit(pZip, enmLevel, enmType == RTZIPTYPE_ZLIB /*fZlibHeader*/);
 #endif
             break;
@@ -1584 +1600 @@
 
         case RTZIPTYPE_ZLIB:
+        case RTZIPTYPE_ZLIB_NO_HEADER:
 #ifdef RTZIP_USE_ZLIB
-            rc = rtZipZlibDecompInit(pZip);
+            rc = rtZipZlibDecompInit(pZip, pZip->enmType == RTZIPTYPE_ZLIB /*fHeader*/);
 #else
             AssertMsgFailed(("Zlib is not include in this build!\n"));

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

@@ -66 +66 @@
  RTTar_SOURCES = RTTar.cpp
 
+ # RTUnzip - our unzip clone (for testing the unzip streaming code)
+ PROGRAMS += RTUnzip
+ RTUnzip_TEMPLATE = VBoxR3Tool
+ RTUnzip_SOURCES = RTUnzip.cpp
+
  # RTNtDbgHelp - our tar clone (for testing the tar/gzip/gunzip streaming code)
  PROGRAMS.win += RTNtDbgHelp

trunk/src/VBox/Runtime/tools/RTUnzip.cpp

@@ -40 +40 @@
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);
-    return RTZipTarCmd(argc, argv);
+    return RTZipUnzipCmd(argc, argv);
 }