Changeset 67871 in vbox

Timestamp:

Jul 9, 2017 1:47:10 PM (8 years ago)

Author:

vboxsync

Message:

isomakercmd: Must ignore TRANS.TBL files too.

File:

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

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

@@ -360 +360 @@
     /** @} */
 
+    /** @name Filteringer
+     * @{ */
+    /** The trans.tbl filename when enabled.  We must not import these files. */
+    const char         *pszTransTbl;
+    /** @} */
+
     /** Number of items (files, directories, images, whatever) we've added. */
     uint32_t            cItemsAdded;
@@ -1581 +1587 @@
 static bool rtFsIsoMakerCmdIsFilteredOut(PRTFSISOMAKERCMDOPTS pOpts, const char *pszDir, const char *pszName, bool fIsDir)
 {
+    /* Ignore trans.tbl files. */
+    if (   !fIsDir
+        && RTStrICmp(pszName, pOpts->pszTransTbl) == 0)
+        return true;
+
     RT_NOREF(pOpts, pszDir, pszName, fIsDir);
     return false;
@@ -2934 +2945 @@
     Opts.afNameSpecifiers[0]    = RTFSISOMAKERCMDNAME_MAJOR_MASK;
     Opts.fDstNamespaces         = RTFSISOMAKERCMDNAME_MAJOR_MASK;
+    Opts.pszTransTbl            = "TRANS.TBL"; /** @todo query this below */
     if (phVfsFile)
         *phVfsFile = NIL_RTVFSFILE;