Changeset 49320 in vbox for trunk/src/VBox/Runtime/tools

Timestamp:

Oct 29, 2013 12:39:25 PM (11 years ago)

Author:

vboxsync

Message:

RTGZip.cpp: Accept zlib headers. Don't complain about EINVAL on flush (stdout, pipes).

File:

• trunk/src/VBox/Runtime/tools/RTGzip.cpp (modified) (2 diffs)

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

@@ -138 +138 @@
 
     int rc = RTVfsIoStrmFlush(*phVfsDst);
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(rc) && rc != VERR_INVALID_PARAMETER)
         rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to flush the output file: %Rrc", rc);
     RTVfsIoStrmRelease(*phVfsDst);
@@ -208 +208 @@
      * Attach the decompressor to the input stream.
      */
+    uint32_t fFlags = 0;
+    fFlags |= RTZIPGZIPDECOMP_F_ALLOW_ZLIB_HDR;
     RTVFSIOSTREAM hVfsGunzip;
-    int rc = RTZipGzipDecompressIoStream(*phVfsSrc, 0 /*fFlags*/, &hVfsGunzip);
+    int rc = RTZipGzipDecompressIoStream(*phVfsSrc, fFlags, &hVfsGunzip);
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTZipGzipDecompressIoStream failed: %Rrc", rc);