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

Timestamp:

Feb 3, 2023 11:16:23 AM (2 years ago)

Author:

vboxsync

Message:

Runtime/common/zip/tarcmd.cpp: Add support for cpio archives and archiving symlinks [build fix, committed too much]

File:

• trunk/src/VBox/Runtime/common/zip/tarcmd.cpp (modified) (7 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 or J). */
+    /** The compressor/decompressor method to employ (0, z or j). */
     char            chZipper;
 
@@ -332 +332 @@
                                             RTFSOBJINFO paObjInfo[3], const char *pszDst, PRTERRINFOSTATIC pErrInfo)
 {
-    RT_NOREF(paObjInfo);
-
     if (pOpts->fVerbose)
         RTPrintf("%s\n", pszDst);
@@ -597 +595 @@
                 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 */
@@ -870 +859 @@
             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':
@@ -1686 +1666 @@
              "    -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"
@@ -1772 +1748 @@
         { "--gunzip",               'z',                                RTGETOPT_REQ_NOTHING },
         { "--ungzip",               'z',                                RTGETOPT_REQ_NOTHING },
-#ifdef IPRT_WITH_LZMA
-        { "--xz",                   'J',                                RTGETOPT_REQ_NOTHING },
-#endif
 
         /* other options. */
@@ -1867 +1840 @@
             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");