Changeset 67845 in vbox

Timestamp:

Jul 6, 2017 6:44:24 PM (8 years ago)

Author:

vboxsync

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

116782

Message:

isomakerimport: ignore TRANS.TBL files.

File:

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

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

@@ -139 +139 @@
     /** Set if we've already seen a joliet volume descriptor. */
     bool                    fSeenJoliet;
+
+    /** The name of the TRANS.TBL in the import media (must ignore). */
+    const char             *pszTransTbl;
 
     /** Pointer to the import results structure (output). */
@@ -1573 +1576 @@
                                                                    pThis->szNameBuf, pThis->szRockNameBuf, cDepth + 1, pTodoList);
                 else if (pThis->szRockSymlinkTargetBuf[0] == '\0')
-                    rtFsIsoImportProcessIso9660AddAndNameFile(pThis, pDirRec, &ObjInfo, cbData, fNamespace, idxDir,
-                                                              pThis->szNameBuf, pThis->szRockNameBuf);
+                {
+                    if (strcmp(pThis->szNameBuf, pThis->pszTransTbl) != 0)
+                        rtFsIsoImportProcessIso9660AddAndNameFile(pThis, pDirRec, &ObjInfo, cbData, fNamespace, idxDir,
+                                                                  pThis->szNameBuf, pThis->szRockNameBuf);
+                }
                 else
                     rtFsIsoImportProcessIso9660AddAndNameSymlink(pThis, pDirRec, &ObjInfo, fNamespace, idxDir, pThis->szNameBuf,
@@ -1615 +1621 @@
     pThis->offSuspSkip = 0;
     pThis->fSuspSeenSP = false;
+    pThis->pszTransTbl = "TRANS.TBL"; /** @todo query this from the iso maker! */
 
     /*