Changeset 66762 in vbox for trunk/src/VBox/Runtime/common/fs

Timestamp:

May 3, 2017 10:20:16 PM (8 years ago)

Author:

vboxsync

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

115174

Message:

iprt: More vfs bits.

Location:

trunk/src/VBox/Runtime/common/fs

Files:

• fatvfs.cpp (modified) (6 diffs)
• iso9660vfs.cpp (modified) (4 diffs)

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

@@ -51 +51 @@
 #include <iprt/zero.h>
 #include <iprt/formats/fat.h>
+
+#include "internal/fs.h"
 
 
@@ -1458 +1460 @@
     pObj->offEntryInDir     = offEntryInDir;
     pObj->fAttrib           = ((RTFMODE)pDirEntry->fAttrib << RTFS_DOS_SHIFT) & RTFS_DOS_MASK_OS2;
+    pObj->fAttrib           = rtFsModeFromDos(pObj->fAttrib, (char *)&pDirEntry->achName[0], sizeof(pDirEntry->achName), 0);
     pObj->cbObject          = pDirEntry->cbFile;
     pObj->fMaybeDirtyFat    = false;
@@ -3481 +3484 @@
 
 /**
+ * @interface_method_impl{RTVFSDIROPS,pfnQueryEntryInfo}
+ */
+static DECLCALLBACK(int) rtFsFatDir_QueryEntryInfo(void *pvThis, const char *pszEntry,
+                                                   PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr)
+{
+    /*
+     * Try locate the entry.
+     */
+    PRTFSFATDIR pThis = (PRTFSFATDIR)pvThis;
+    uint32_t    offEntryInDir;
+    bool        fLong;
+    FATDIRENTRY DirEntry;
+    int rc = rtFsFatDir_FindEntry(pThis, pszEntry, &offEntryInDir, &fLong, &DirEntry);
+    Log2(("rtFsFatDir_QueryEntryInfo: FindEntry(,%s,) -> %Rrc\n", pszEntry, rc));
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * To avoid duplicating code in rtFsFatObj_InitFromDirRec and
+         * rtFsFatObj_QueryInfo, we create a dummy RTFSFATOBJ on the stack.
+         */
+        RTFSFATOBJ TmpObj;
+        RT_ZERO(TmpObj);
+        rtFsFatObj_InitFromDirEntry(&TmpObj, &DirEntry, offEntryInDir, pThis->Core.pVol);
+        rc = rtFsFatObj_QueryInfo(&TmpObj, pObjInfo, enmAddAttr);
+    }
+    return rc;
+}
+
+
+/**
  * @interface_method_impl{RTVFSDIROPS,pfnUnlinkEntry}
  */
@@ -3486 +3519 @@
 {
     RT_NOREF(pvThis, pszEntry, fType);
+RTAssertMsg2("%s: %s\n", __FUNCTION__, pszEntry);
+    return VERR_NOT_IMPLEMENTED;
+}
+
+
+/**
+ * @interface_method_impl{RTVFSDIROPS,pfnRenameEntry}
+ */
+static DECLCALLBACK(int) rtFsFatDir_RenameEntry(void *pvThis, const char *pszEntry, RTFMODE fType, const char *pszNewName)
+{
+    RT_NOREF(pvThis, pszEntry, fType, pszNewName);
 RTAssertMsg2("%s: %s\n", __FUNCTION__, pszEntry);
     return VERR_NOT_IMPLEMENTED;
@@ -3543 +3587 @@
     rtFsFatDir_OpenSymlink,
     rtFsFatDir_CreateSymlink,
+    rtFsFatDir_QueryEntryInfo,
     rtFsFatDir_UnlinkEntry,
+    rtFsFatDir_RenameEntry,
     rtFsFatDir_RewindDir,
     rtFsFatDir_ReadDir,
@@ -3664 +3710 @@
             rtFsFatObj_InitFromDirEntry(&pNewDir->Core, pDirEntry, offEntryInDir, pThis);
         else
-            rtFsFatObj_InitDummy(&pNewDir->Core, cbDir, RTFS_DOS_DIRECTORY, pThis);
+            rtFsFatObj_InitDummy(&pNewDir->Core, cbDir, RTFS_TYPE_DIRECTORY | RTFS_DOS_DIRECTORY | RTFS_UNIX_ALL_PERMS, pThis);
 
         pNewDir->hVfsSelf           = *phVfsDir;

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

@@ -937 +937 @@
  */
 static DECLCALLBACK(int) rtFsIso9660Dir_CreateSymlink(void *pvThis, const char *pszSymlink, const char *pszTarget,
-                                                  RTSYMLINKTYPE enmType, PRTVFSSYMLINK phVfsSymlink)
+                                                      RTSYMLINKTYPE enmType, PRTVFSSYMLINK phVfsSymlink)
 {
     RT_NOREF(pvThis, pszSymlink, pszTarget, enmType, phVfsSymlink);
@@ -945 +945 @@
 
 /**
+ * @interface_method_impl{RTVFSDIROPS,pfnQueryEntryInfo}
+ */
+static DECLCALLBACK(int) rtFsIso9660Dir_QueryEntryInfo(void *pvThis, const char *pszEntry,
+                                                       PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr)
+{
+    /*
+     * Try locate the entry.
+     */
+    PRTFSISO9660DIR pThis = (PRTFSISO9660DIR)pvThis;
+    PCISO9660DIRREC pDirRec;
+    uint64_t        offDirRec;
+    uint32_t        cDirRecs;
+    RTFMODE         fMode;
+    int rc = rtFsIso9660Dir_FindEntry(pThis, pszEntry, &offDirRec, &pDirRec, &cDirRecs, &fMode);
+    Log2(("rtFsIso9660Dir_QueryEntryInfo: FindEntry(,%s,) -> %Rrc\n", pszEntry, rc));
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * To avoid duplicating code in rtFsIso9660Obj_InitFromDirRec and
+         * rtFsIso9660Obj_QueryInfo, we create a dummy RTFSISO9660OBJ on the stack.
+         */
+        RTFSISO9660OBJ TmpObj;
+        RT_ZERO(TmpObj);
+        rtFsIso9660Obj_InitFromDirRec(&TmpObj, pDirRec, cDirRecs, offDirRec, pThis->Core.pVol);
+        rc = rtFsIso9660Obj_QueryInfo(&TmpObj, pObjInfo, enmAddAttr);
+    }
+    return rc;
+}
+
+
+/**
  * @interface_method_impl{RTVFSDIROPS,pfnUnlinkEntry}
  */
@@ -950 +981 @@
 {
     RT_NOREF(pvThis, pszEntry, fType);
+    return VERR_WRITE_PROTECT;
+}
+
+
+/**
+ * @interface_method_impl{RTVFSDIROPS,pfnRenameEntry}
+ */
+static DECLCALLBACK(int) rtFsIso9660Dir_RenameEntry(void *pvThis, const char *pszEntry, RTFMODE fType, const char *pszNewName)
+{
+    RT_NOREF(pvThis, pszEntry, fType, pszNewName);
     return VERR_WRITE_PROTECT;
 }
@@ -1006 +1047 @@
     rtFsIso9660Dir_OpenSymlink,
     rtFsIso9660Dir_CreateSymlink,
+    rtFsIso9660Dir_QueryEntryInfo,
     rtFsIso9660Dir_UnlinkEntry,
+    rtFsIso9660Dir_RenameEntry,
     rtFsIso9660Dir_RewindDir,
     rtFsIso9660Dir_ReadDir,