Changeset 95435 in vbox for trunk/src/VBox

Timestamp:

Jun 29, 2022 5:15:04 PM (3 years ago)

Author:

vboxsync

Message:

Runtime/isomaker.cpp: RRIP 1.12 mandates to set special flags in the NM entries for the current and parent directory, fixes the FreeBSD bootloader not being able to boot from re-mastered images

File:

• trunk/src/VBox/Runtime/common/fs/isomaker.cpp (modified) (9 diffs)

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

@@ -642 +642 @@
 /** Pointer to the instance data of an ISO maker output file. */
 typedef RTFSISOMAKEROUTPUTFILE *PRTFSISOMAKEROUTPUTFILE;
+
+
+/**
+ * Directory entry type.
+ */
+typedef enum RTFSISOMAKERDIRENTRY
+{
+    /** Invalid directory entry. */
+    RTFSISOMAKERDIRENTRY_INVALID = 0,
+    /** Entry for the current directory, aka ".". */
+    RTFSISOMAKERDIRENTRY_CURRENT,
+    /** Entry for the parent directory, aka "..". */
+    RTFSISOMAKERDIRENTRY_PARENT,
+    /** Entry for a regular directory entry. */
+    RTFSISOMAKERDIRENTRY_OTHER
+} RTFSISOMAKERDIRENTRY;
 
 
@@ -5837 +5853 @@
  *                          directory record (false).
  */
-static void rtFsIosMakerOutFile_GenerateRockRidge(PRTFSISOMAKERNAME pName, uint8_t *pbSys, size_t cbSys, bool fInSpill)
+static void rtFsIosMakerOutFile_GenerateRockRidge(PRTFSISOMAKERNAME pName, uint8_t *pbSys, size_t cbSys, bool fInSpill,
+                                                  RTFSISOMAKERDIRENTRY enmEntry)
 {
     /*
@@ -5981 +5998 @@
                 pNM->Hdr.bVersion   = ISO9660RRIPNM_VER;
                 pNM->fFlags         = cchThis == cchSrc ? 0 : ISO9660RRIP_NM_F_CONTINUE;
+                if (enmEntry == RTFSISOMAKERDIRENTRY_CURRENT)
+                    pNM->fFlags    |= ISO9660RRIP_NM_F_CURRENT;
+                else if (enmEntry == RTFSISOMAKERDIRENTRY_PARENT)
+                    pNM->fFlags    |= ISO9660RRIP_NM_F_PARENT;
                 memcpy(&pNM->achName[0], pszSrc, cchThis);
                 pbSys  += RT_UOFFSETOF(ISO9660RRIPNM, achName) + cchThis;
@@ -6149 +6170 @@
 
         AssertReturn(cbToRead >= pChild->cbRockSpill, VERR_ISOMK_IPE_RR_READ);
-        rtFsIosMakerOutFile_GenerateRockRidge(pDir->pName, pbBuf, cbToRead, true /*fInSpill*/);
+        rtFsIosMakerOutFile_GenerateRockRidge(pDir->pName, pbBuf, cbToRead, true /*fInSpill*/, RTFSISOMAKERDIRENTRY_OTHER);
         cbToRead  -= pChild->cbRockSpill;
         pbBuf     += pChild->cbRockSpill;
@@ -6658 +6679 @@
  */
 static uint32_t rtFsIsoMakerOutFile_GenerateDirRec(PRTFSISOMAKERNAME pName, bool fUnicode, uint8_t *pbBuf,
-                                                   PRTFSISOMAKERFINALIZEDDIRS pFinalizedDirs)
+                                                   PRTFSISOMAKERFINALIZEDDIRS pFinalizedDirs, RTFSISOMAKERDIRENTRY enmEntry)
 {
     /*
@@ -6733 +6754 @@
             RT_BZERO(&pbSys[pName->cbRockInDirRec], cbSys - pName->cbRockInDirRec);
         if (pName->cbRockSpill == 0)
-            rtFsIosMakerOutFile_GenerateRockRidge(pName, pbSys, cbSys, false /*fInSpill*/);
+            rtFsIosMakerOutFile_GenerateRockRidge(pName, pbSys, cbSys, false /*fInSpill*/, enmEntry);
         else
         {
@@ -6798 +6819 @@
      * Normally there is just a single record without any zero padding.
      */
-    uint32_t cbReturn = rtFsIsoMakerOutFile_GenerateDirRec(pName, fUnicode, pbBuf, pFinalizedDirs);
+    uint32_t cbReturn = rtFsIsoMakerOutFile_GenerateDirRec(pName, fUnicode, pbBuf, pFinalizedDirs, RTFSISOMAKERDIRENTRY_OTHER);
     if (RT_LIKELY(pName->cbDirRecTotal == cbReturn))
         return cbReturn;
@@ -6874 +6895 @@
     uint8_t abTmpBuf[256];
     Assert(pName->cbDirRec <= sizeof(abTmpBuf));
-    uint32_t const cbOne = rtFsIsoMakerOutFile_GenerateDirRec(pName, fUnicode, abTmpBuf, pFinalizedDirs);
+    uint32_t const cbOne = rtFsIsoMakerOutFile_GenerateDirRec(pName, fUnicode, abTmpBuf, pFinalizedDirs, RTFSISOMAKERDIRENTRY_OTHER);
     Assert(cbOne == pName->cbDirRec);
     if (cbOne == pName->cbDirRecTotal)
@@ -6993 +7014 @@
     uint8_t abTmpBuf[256];
     Assert(off < pName->cbDirRec);
-    size_t cbToCopy = rtFsIsoMakerOutFile_GenerateDirRec(pName, fUnicode, abTmpBuf, pFinalizedDirs);
+    size_t cbToCopy = rtFsIsoMakerOutFile_GenerateDirRec(pName, fUnicode, abTmpBuf, pFinalizedDirs,
+                                                         bDirId == 0 ? RTFSISOMAKERDIRENTRY_CURRENT : RTFSISOMAKERDIRENTRY_PARENT);
     Assert(cbToCopy == pName->cbDirRec);