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

Timestamp:

Jul 8, 2017 6:40:50 PM (7 years ago)

Author:

vboxsync

Message:

isomaker: Adding --push-iso / --pop options for adding select files and/or directories from another ISO. Implemented adding directories from VFSs (real directories are not yet implemented). [build fix]

File:

• trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp

@@ -1526 +1526 @@
 
 /**
- * Enteres an object into the namespaces given the parent and single name.
- *
- * This is used by the directory tree recursion code.
- *
- * @returns IPRT status code.
- * @param   pOpts           The ISO maker command instance.
- * @param   idxObj          The configuration index of the object to be named.
- * @param   idxParentObj    The configuration index of the parent directory.
- * @param   pszName         The name of the object.
- * @param   pParsed         The parsed names - only fNameSpecifies used, no
- *                          names.
- * @param   pszSrc          The full source path for error reporting.
- */
-static int rtFsIsoMakerCmdSetNameAndParent(PRTFSISOMAKERCMDOPTS pOpts, uint32_t idxObj, uint32_t idxParentObj,
-                                           const char *pszName, PCRTFSISOMKCMDPARSEDNAMES pParsed, const char *pszSrc)
-{
-    int rc = VINF_SUCCESS;
-    for (uint32_t i = 0; i < pParsed->cNames; i++)
-        if (pParsed->aNames[i].cchPath > 0)
-        {
-            if (pParsed->aNames[i].fNameSpecifiers & RTFSISOMAKERCMDNAME_MAJOR_MASK)
-            {
-                rc = RTFsIsoMakerObjSetNameAndParent(pOpts->hIsoMaker, idxObj, idxParentObj,
-                                                     pParsed->aNames[i].fNameSpecifiers & RTFSISOMAKERCMDNAME_MAJOR_MASK,
-                                                     pszName);
-                if (RT_FAILURE(rc))
-                {
-                    rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error setting parent & name '%s' on '%s': %Rrc",
-                                                pszName, pszSrc, rc);
-                    break;
-                }
-            }
-            if (pParsed->aNames[i].fNameSpecifiers & RTFSISOMAKERCMDNAME_MINOR_MASK)
-            {
-                /** @todo add APIs for this.   */
-            }
-        }
-    return rc;
-}
-
-
-/**
  * Adds a file.
  *
@@ -1609 +1567 @@
 }
 
+
+/**
+ * Applies filtering rules.
+ *
+ * @returns true if filtered out, false if included.
+ * @param   pOpts       The ISO maker command instance.
+ * @param   pszSrc      The source source.
+ * @param   pszName     The name part (maybe different buffer from pszSrc).
+ * @param   fIsDir      Set if directory, clear if not.
+ */
 static bool rtFsIsoMakerCmdIsFilteredOut(PRTFSISOMAKERCMDOPTS pOpts, const char *pszDir, const char *pszName, bool fIsDir)
 {
@@ -1614 +1582 @@
     return false;
 }
+
 
 /**