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

Timestamp:

Feb 25, 2023 6:26:14 PM (22 months ago)

Author:

vboxsync

Message:

Config.kmk,Runtime: Add support for xz archives using liblzma-5.4.1, bugref:10254

Location:

trunk/src/VBox/Runtime/common/zip

Files:

• lzmavfs.cpp (added)
• tarcmd.cpp (modified) (6 diffs)

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

@@ -126 +126 @@
     /** Whether to handle directories recursively or not. Defaults to \c true. */
     bool            fRecursive;
-    /** The compressor/decompressor method to employ (0, z or j). */
+    /** The compressor/decompressor method to employ (0, z or j or J). */
     char            chZipper;
 
@@ -597 +597 @@
                 RTMsgError("Failed to open gzip decompressor: %Rrc", rc);
             break;
+
+#ifdef IPRT_WITH_LZMA
+        /* xz/lzma */
+        case 'J':
+            rc = RTZipXzCompressIoStream(hVfsIos, 0 /*fFlags*/, 6, &hVfsIosComp);
+            if (RT_FAILURE(rc))
+                RTMsgError("Failed to open xz compressor: %Rrc", rc);
+            break;
+#endif
 
         /* bunzip2 */
@@ -861 +870 @@
             break;
 
+#ifdef IPRT_WITH_LZMA
+        /* xz/lzma */
+        case 'J':
+            rc = RTZipXzDecompressIoStream(hVfsIos, 0 /*fFlags*/, &hVfsIosDecomp);
+            if (RT_FAILURE(rc))
+                RTMsgError("Failed to open gzip decompressor: %Rrc", rc);
+            break;
+#endif
+
         /* bunzip2 */
         case 'j':
@@ -1668 +1686 @@
              "    -z, --gzip, --gunzip, --ungzip        (all)\n"
              "        Compress/decompress the archive with gzip.\n"
+#ifdef IPRT_WITH_LZMA
+             "    -J, --xz                              (all)\n"
+             "        Compress/decompress the archive using xz/lzma.\n"
+#endif
              "\n");
     RTPrintf("Misc Options:\n"
@@ -1750 +1772 @@
         { "--gunzip",               'z',                                RTGETOPT_REQ_NOTHING },
         { "--ungzip",               'z',                                RTGETOPT_REQ_NOTHING },
+#ifdef IPRT_WITH_LZMA
+        { "--xz",                   'J',                                RTGETOPT_REQ_NOTHING },
+#endif
 
         /* other options. */
@@ -1842 +1867 @@
             case 'j':
             case 'z':
+#ifdef IPRT_WITH_LZMA
+            case 'J':
+#endif
                 if (Opts.chZipper)
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "You may only specify one compressor / decompressor");