Changeset 47340 in vbox for trunk/src/VBox/Runtime/common/zip

Timestamp:

Jul 23, 2013 12:27:35 PM (12 years ago)

Author:

vboxsync

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

87485

Message:

pr6022. OVA appliance don't fail when a certificate file exists. GZIP support has been implemented (first version).

File:

• trunk/src/VBox/Runtime/common/zip/zip.cpp (modified) (2 diffs)

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

@@ -575 +575 @@
 {
     pZip->u.Zlib.next_out = (Bytef *)pvBuf;
-    pZip->u.Zlib.avail_out = (uInt)cbBuf;                   Assert(pZip->u.Zlib.avail_out == cbBuf);
+    pZip->u.Zlib.avail_out = (uInt)cbBuf;
+    Assert(pZip->u.Zlib.avail_out == cbBuf);
 
     /*
@@ -1927 +1928 @@
 RT_EXPORT_SYMBOL(RTZipBlockDecompress);
 
+RTDECL(int) RTZipGzipDecompressBuffer(z_stream streamIn,
+                                      uint32_t *cbDecompressed,
+                                      bool *finished)
+{
+    int rc;
+    int sh = streamIn.avail_out;
+
+    *cbDecompressed = 0;
+
+    do
+    {
+        rc = inflate(&streamIn, Z_NO_FLUSH);
+
+        if (rc < 0)
+        {
+            rc = zipErrConvertFromZlib(rc, false /*decompress*/);
+            break;
+        }
+
+        *cbDecompressed += (sh - streamIn.avail_out);
+        sh = streamIn.avail_out;
+    }
+    while (streamIn.avail_out > 0 && streamIn.avail_in > 0 );
+
+    if (RT_SUCCESS(rc))
+    {
+        if (streamIn.avail_in == 0)
+            *finished = true;
+        else
+        {
+            if (streamIn.avail_out == 0)
+                *finished = false;
+        }
+    }
+
+    return rc;
+}
+
+RT_EXPORT_SYMBOL(RTZipGzipDecompressBuffer);