Changeset 67454 in vbox for trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp

Timestamp:

Jun 16, 2017 6:03:37 PM (8 years ago)

Author:

vboxsync

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

116187

Message:

IPRT: More ISO maker code (booting related).

File:

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

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

@@ -1108 +1108 @@
         pParsed->cNamesWithSrc++;
 
-        if (!pszEqual && fWithSrc)
+        if (!pszEqual)
         {
-            if (!cchName)
-                return rtFsIsoMakerCmdSyntaxError(pOpts, "empty source file name: %s", pszSpecIn);
-            if (cchName == 8 && strcmp(pszSpec, ":remove:") == 0)
-                pParsed->enmSrcType = RTFSISOMKCMDPARSEDNAMES::kSrcType_Remove;
-            else if (cchName == 13 && strcmp(pszSpec, ":must-remove:") == 0)
-                pParsed->enmSrcType = RTFSISOMKCMDPARSEDNAMES::kSrcType_MustRemove;
+            if (fWithSrc)
+            {
+                if (!cchName)
+                    return rtFsIsoMakerCmdSyntaxError(pOpts, "empty source file name: %s", pszSpecIn);
+                if (cchName == 8 && strcmp(pszSpec, ":remove:") == 0)
+                    pParsed->enmSrcType = RTFSISOMKCMDPARSEDNAMES::kSrcType_Remove;
+                else if (cchName == 13 && strcmp(pszSpec, ":must-remove:") == 0)
+                    pParsed->enmSrcType = RTFSISOMKCMDPARSEDNAMES::kSrcType_MustRemove;
+            }
             break;
         }
@@ -1901 +1904 @@
     if (phVfsFile)
         *phVfsFile = NIL_RTVFSFILE;
+    for (uint32_t i = 0; i < RT_ELEMENTS(Opts.aBootCatEntries); i++)
+        Opts.aBootCatEntries[i].u.Section.idxImageObj = UINT32_MAX;
 
     /* Setup option parsing. */