Changeset 67454 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

IPRT: More ISO maker code (booting related).

Location:

trunk/src/VBox/Runtime/common/fs

Files:

• isomaker.cpp (modified) (3 diffs)
• isomakercmd.cpp (modified) (2 diffs)

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

@@ -1447 +1447 @@
         char ch;
         size_t cchComponent = 0;
-        while ((ch = pszPath[cchComponent]) != '\0' && RTPATH_IS_SLASH(ch))
+        while ((ch = pszPath[cchComponent]) != '\0' && !RTPATH_IS_SLASH(ch))
             cchComponent++;
         if (!cchComponent)
@@ -3300 +3300 @@
     }
 
+    /* Save for size setting. */
+    uint32_t const cEntriesInFile = cEntries + 1;
+
     /* Check that the remaining entries are empty. */
-    while (cEntries < RT_ELEMENTS(pThis->aBootCatEntries) - 1U)
+    while (cEntries < RT_ELEMENTS(pThis->aBootCatEntries))
     {
         AssertReturn(pThis->aBootCatEntries[cEntries].cEntries == 0, VERR_ISOMK_BOOT_CAT_ERRATIC_ENTRY);
         cEntries++;
     }
+
+    /*
+     * Fixate the size of the boot catalog file.
+     */
+    pThis->pBootCatFile->cbData = cEntriesInFile * 32;
+    pThis->cbData  += RT_ALIGN_32(cEntriesInFile * 32, RTFSISOMAKER_SECTOR_SIZE);
 
     /*
@@ -4334 +4343 @@
     if ((offInFile = offUnsigned - pFile->offData) < RT_ALIGN_64(pFile->cbData, RTFSISOMAKER_SECTOR_SIZE))
     { /* hit */ }
-    else if (offUnsigned > pFile->offData)
+    else if (offUnsigned >= pFile->offData)
     {
         /* Seek forwards. */

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. */