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

Timestamp:

Feb 25, 2023 6:26:14 PM (2 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (9 diffs)
• common/zip/lzmavfs.cpp (added)
• common/zip/tarcmd.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -342 +342 @@
 ifdef IPRT_WITH_LZO
  RuntimeBaseR3_DEFS        += RTZIP_USE_LZO
+endif
+ifdef VBOX_WITH_LIBLZMA
+ RuntimeBaseR3_DEFS        += IPRT_WITH_LZMA
+ RuntimeBaseR3_SDKS        += VBoxLibLzma
 endif
 ifn1of ($(KBUILD_TARGET), win)
@@ -812 +816 @@
         r3/generic/semspinmutex-r3-generic.cpp \
         r3/xml.cpp \
-        common/zip/xarvfs.cpp
+        common/zip/xarvfs.cpp \
+        common/zip/lzmavfs.cpp \
 
 
@@ -1833 +1838 @@
         r3/xml.cpp \
         common/zip/xarvfs.cpp \
+        common/zip/lzmavfs.cpp \
         common/misc/json.cpp \
         generic/RTLogWriteStdErr-generic.cpp \
@@ -2465 +2471 @@
         common/vfs/vfsstdpipe.cpp \
         common/zip/gzipvfs.cpp \
+        common/zip/lzmavfs.cpp \
         common/zip/tarcmd.cpp \
         common/zip/tarvfs.cpp \
@@ -2707 +2714 @@
 RuntimeGuestR3_TEMPLATE                 := VBoxGuestR3Lib
 RuntimeGuestR3_EXTENDS                  := RuntimeR3
-RuntimeGuestR3_DEFS                      = $(filter-out RTCRITSECT_STRICT RT_NO_GIP IN_SUP_R3, $(RuntimeR3_DEFS))
+RuntimeGuestR3_DEFS                      = $(filter-out RTCRITSECT_STRICT RT_NO_GIP IN_SUP_R3 IPRT_WITH_LZMA, $(RuntimeR3_DEFS))
 RuntimeGuestR3_SOURCES                   = $(filter-out \
         common/time/timesupref.cpp \
@@ -2713 +2720 @@
         common/time/timesup.cpp \
         common/zip/xarvfs.cpp \
+        common/zip/lzmavfs.cpp \
         r3/xml.cpp \
         generic/RTLogWriteUser-generic.cpp \
@@ -2774 +2782 @@
  VBoxRT_SDKS                  += VBoxLibCurl
 endif
+ifdef VBOX_WITH_LIBLZMA
+ VBoxRT_SDKS                  += VBoxLibLzma
+endif
 VBoxRT_SDKS                   += VBoxOpenSslStatic
 if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS))
@@ -2794 +2805 @@
 ifdef VBOX_WITH_LIBCURL
  VBoxRT_DEFS                  += IPRT_WITH_HTTP
+endif
+ifdef VBOX_WITH_LIBLZMA
+ VBoxRT_DEFS                  += IPRT_WITH_LZMA
 endif
 ifdef RTALLOC_REPLACE_MALLOC
@@ -3011 +3025 @@
 ifdef VBOX_WITH_LIBCURL
  VBoxRT-x86_SDKS += VBoxLibCurl-x86
+endif
+ifdef VBOX_WITH_LIBZMA
+ VBoxRT-x86_SDKS += VBoxLibLzma-x86
 endif
 VBoxRT-x86_SDKS  += VBoxOpenSslStatic-x86

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");