Changeset 67849 in vbox

Timestamp:

Jul 7, 2017 12:40:49 PM (8 years ago)

Author:

vboxsync

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

116800

Message:

isomaker: Symlink fix and mode bit fix.

Location:

trunk/src/VBox/Runtime/common/fs

Files:

• iso9660vfs.cpp (modified) (1 diff)
• isomaker.cpp (modified) (2 diffs)

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

@@ -800 +800 @@
 
 /**
- * FAT file operations.
+ * ISO FS file operations.
  */
 DECL_HIDDEN_CONST(const RTVFSFILEOPS) g_rtFsIos9660FileOps =

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

@@ -5178 +5178 @@
     pEntry->fFlags       = 0;
     size_t  offEntry = 0;
-    size_t  off      = pEntry->Hdr.cbEntry;
+    size_t  off      = RT_UOFFSETOF(ISO9660RRIPSL, abComponents);
 
     /* Does it start with a root slash? */
@@ -5378 +5378 @@
             pPX->Hdr.cbEntry    = ISO9660RRIPPX_LEN;
             pPX->Hdr.bVersion   = ISO9660RRIPPX_VER;
-            pPX->fMode.be       = RT_H2BE_U32((uint32_t)pName->fMode);
-            pPX->fMode.le       = RT_H2LE_U32((uint32_t)pName->fMode);
+            pPX->fMode.be       = RT_H2BE_U32((uint32_t)(pName->fMode & RTFS_UNIX_MASK));
+            pPX->fMode.le       = RT_H2LE_U32((uint32_t)(pName->fMode & RTFS_UNIX_MASK));
             pPX->cHardlinks.be  = RT_H2BE_U32((uint32_t)pName->cHardlinks);
             pPX->cHardlinks.le  = RT_H2LE_U32((uint32_t)pName->cHardlinks);