Changeset 86035 in vbox

Timestamp:

Sep 6, 2020 8:31:16 PM (5 years ago)

Author:

vboxsync

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

140245

Message:

Runtime/cpiovfs.cpp: A simple CPIO archive reader (WIP, writer comes next and then some cleanup)

Location:

trunk

Files:

• include/iprt/formats/cpio.h (added)
• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/zip.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/zip/cpiovfs.cpp (added)
• src/VBox/Runtime/common/zip/cpiovfsreader.h (added)
• src/VBox/Runtime/common/zip/tarcmd.cpp (modified) (4 diffs)

trunk/include/iprt/mangling.h

@@ -2920 +2920 @@
 # define RTZipXarFsStreamFromIoStream                   RT_MANGLER(RTZipXarFsStreamFromIoStream)
 # define RTZipTarFsStreamForFile                        RT_MANGLER(RTZipTarFsStreamForFile)
+# define RTZipCpioFsStreamFromIoStream                  RT_MANGLER(RTZipCpioFsStreamFromIoStream)
 
 /* sort/merge into the above later: */

trunk/include/iprt/zip.h

@@ -501 +501 @@
 RTDECL(int) RTZipXarFsStreamFromIoStream(RTVFSIOSTREAM hVfsIosIn, uint32_t fFlags, PRTVFSFSSTREAM phVfsFss);
 
+/**
+ * Opens a CPIO filesystem stream.
+ *
+ * This is used to extract, list or check a CPIO archive.
+ *
+ * @returns IPRT status code.
+ *
+ * @param   hVfsIosIn           The input stream.  The reference is not
+ *                              consumed, instead another one is retained.
+ * @param   fFlags              Flags, MBZ.
+ * @param   phVfsFss            Where to return the handle to the CPIO
+ *                              filesystem stream.
+ */
+RTDECL(int) RTZipCpioFsStreamFromIoStream(RTVFSIOSTREAM hVfsIosIn, uint32_t fFlags, PRTVFSFSSTREAM phVfsFss);
+
 /** @} */
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -682 +682 @@
         common/vfs/vfsstdpipe.cpp \
         common/vfs/vfsprintf.cpp \
+        common/zip/cpiovfs.cpp \
         common/zip/tar.cpp \
         common/zip/tarcmd.cpp \

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

@@ -75 +75 @@
     RTZIPTARCMDFORMAT_TAR,
     /** XAR.  */
-    RTZIPTARCMDFORMAT_XAR
+    RTZIPTARCMDFORMAT_XAR,
+    /** CPIO. */
+    RTZIPTARCMDFORMAT_CPIO,
 } RTZIPTARCMDFORMAT;
 
@@ -818 +820 @@
         rc = VERR_NOT_SUPPORTED;
 #endif
+    else if (pOpts->enmFormat == RTZIPTARCMDFORMAT_CPIO)
+        rc = RTZipCpioFsStreamFromIoStream(hVfsIos, 0/*fFlags*/, phVfsFss);
     else /** @todo make RTZipTarFsStreamFromIoStream fail if not tar file! */
         rc = RTZipTarFsStreamFromIoStream(hVfsIos, 0/*fFlags*/, phVfsFss);
@@ -1606 +1610 @@
              "                  pax (tar POSIX.1-2001),\n"
              "                  xar\n"
-             "        Note! Because XAR/TAR detection isn't implemented yet, it\n"
+             "                  cpio\n"
+             "        Note! Because XAR/TAR/CPIO detection isn't implemented yet, it\n"
              "              is necessary to specifcy --format=xar when reading a\n"
-             "              XAR file.  Otherwise this option is only for creation.\n"
+             "              XAR file or --format=cpio for a CPIO file.\n"
+             "              Otherwise this option is only for creation.\n"
              "\n");
     RTPrintf("IPRT Options:\n"
@@ -1861 +1867 @@
                 else if (!strcmp(ValueUnion.psz, "xar"))
                     Opts.enmFormat    = RTZIPTARCMDFORMAT_XAR;
+                else if (!strcmp(ValueUnion.psz, "cpio"))
+                    Opts.enmFormat    = RTZIPTARCMDFORMAT_CPIO;
                 else
                     return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Unknown archive format: '%s'", ValueUnion.psz);