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

Timestamp:

Jun 9, 2017 9:43:30 PM (8 years ago)

Author:

vboxsync

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

116041

Message:

IPRT: More ISO maker code.

File:

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

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

@@ -206 +206 @@
     uint64_t                INode;
 
+    /** The offset of the directory entry in the parent directory. */
+    uint32_t                offDirRec;
     /** Size of the directory record (ISO-9660).
      * This is set when the image is being finalized. */
@@ -1731 +1733 @@
             pName->cHardlinks           = 1;
             pName->INode                = pObj->idxObj;
+            pName->offDirRec            = UINT32_MAX;
             pName->cbDirRec             = 0;
 
@@ -2781 +2784 @@
  * @param   pName           The directory entry to finalize.
  * @param   offInDir        The offset in the directory of this record.
- * @param   fIsRoot         Indicates whether this is the root and would
- *                          therefore require more rock ridge fun and stuff.
+ * @param   uRootRockRidge  This is the rock ridge level when
+ *                          root, otherwise it's zero.
  */
 static int rtFsIsoMakerFinalizeIsoDirectoryEntry(PRTFSISOMAKERFINALIZEDDIRS pFinalizedDirs, PRTFSISOMAKERNAME pName,
-                                                 uint32_t offInDir, bool fIsRoot)
-{
-    RT_NOREF(pFinalizedDirs, pName, offInDir, fIsRoot);
-    return VERR_NOT_IMPLEMENTED;
+                                                 uint32_t offInDir, uint8_t uRootRockRidge)
+{
+    pName->offDirRec = offInDir;
+
+    size_t cbDirRec  = RT_UOFFSETOF(ISO9660DIRREC, achFileId) + pName->cbNameInDirRec + !(pName->cbNameInDirRec & 1);
+    AssertReturn(cbDirRec <= UINT8_MAX, VERR_FILENAME_TOO_LONG);
+    pName->cbDirRec  = (uint8_t)cbDirRec;
+
+    /** @todo rock ridge    */
+    if (pFinalizedDirs->pRRSpillFile)
+    {
+        RT_NOREF(uRootRockRidge);
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -2809 +2823 @@
     pFinalizedDirs->offDirs = *poffData;
 
-    /* Reset the rock ridge spill file, in case we someone are finalized multiple times. */
+    /*
+     * Reset the rock ridge spill file, in case we someone are finalized multiple times.
+     */
     if (pFinalizedDirs->pRRSpillFile)
     {
         rtFsIsoMakerObjRemoveWorker(pThis, &pFinalizedDirs->pRRSpillFile->Core);
         pFinalizedDirs->pRRSpillFile = NULL;
+    }
+    if (pNamespace->fNamespace)
+    {
     }