Changeset 94291 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

Mar 17, 2022 1:29:52 PM (3 years ago)

Author:

vboxsync

Message:

IPRT,Storage: Adding RTVfsQueryLabel and internally a generic pfnQueryInfoEx method to the RTVFSOBJOPS function table. Untested implementation of the latter for iso/udf. bugref:9781

Location:

trunk/src/VBox/Runtime/common/vfs

Files:

• vfsbase.cpp (modified) (2 diffs)
• vfsfss2dir.cpp (modified) (1 diff)
• vfsmemory.cpp (modified) (1 diff)
• vfsprogress.cpp (modified) (2 diffs)
• vfsreadahead.cpp (modified) (2 diffs)
• vfsstddir.cpp (modified) (2 diffs)
• vfsstdfile.cpp (modified) (1 diff)
• vfsstdpipe.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -72 +72 @@
         AssertPtr((a_pObjOps)->pfnClose); \
         AssertPtr((a_pObjOps)->pfnQueryInfo); \
+        AssertPtrNull((a_pObjOps)->pfnQueryInfoEx); \
         Assert((a_pObjOps)->uEndMarker == RTVFSOBJOPS_VERSION); \
     } while (0)
@@ -2308 +2309 @@
 
 
+RTDECL(int) RTVfsQueryLabel(RTVFS hVfs, char *pszLabel, size_t cbLabel, size_t *pcbActual)
+{
+    RTVFSINTERNAL *pThis = hVfs;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->uMagic == RTVFS_MAGIC, VERR_INVALID_HANDLE);
+
+    if (cbLabel > 0)
+        AssertPtrReturn(pszLabel, VERR_INVALID_POINTER);
+
+    int rc;
+    if (pThis->pOps->Obj.pfnQueryInfoEx)
+    {
+        size_t cbActualIgn;
+        if (!pcbActual)
+            pcbActual = &cbActualIgn;
+
+        RTVfsLockAcquireRead(pThis->Base.hLock);
+        rc = pThis->pOps->Obj.pfnQueryInfoEx(pThis->Base.pvThis, RTVFSQIEX_VOL_LABEL, pszLabel, cbLabel, pcbActual);
+        RTVfsLockReleaseRead(pThis->Base.hLock);
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
+    return rc;
+}
+
 
 

trunk/src/VBox/Runtime/common/vfs/vfsfss2dir.cpp

@@ -284 +284 @@
         rtVfsFssToDir_Close,
         rtVfsFssToDir_QueryInfo,
+        NULL,
         RTVFSOBJOPS_VERSION
     },

trunk/src/VBox/Runtime/common/vfs/vfsmemory.cpp

@@ -731 +731 @@
             rtVfsMemFile_Close,
             rtVfsMemFile_QueryInfo,
+            NULL,
             RTVFSOBJOPS_VERSION
         },

trunk/src/VBox/Runtime/common/vfs/vfsprogress.cpp

@@ -308 +308 @@
         rtVfsProgressFile_Close,
         rtVfsProgressFile_QueryInfo,
+        NULL,
         RTVFSOBJOPS_VERSION
     },
@@ -439 +440 @@
             rtVfsProgressFile_Close,
             rtVfsProgressFile_QueryInfo,
+            NULL,
             RTVFSOBJOPS_VERSION
         },

trunk/src/VBox/Runtime/common/vfs/vfsreadahead.cpp

@@ -535 +535 @@
         rtVfsReadAhead_Close,
         rtVfsReadAhead_QueryInfo,
+        NULL,
         RTVFSOBJOPS_VERSION
     },
@@ -562 +563 @@
             rtVfsReadAhead_Close,
             rtVfsReadAhead_QueryInfo,
+            NULL,
             RTVFSOBJOPS_VERSION
         },

trunk/src/VBox/Runtime/common/vfs/vfsstddir.cpp

@@ -166 +166 @@
         rtVfsStdSym_Close,
         rtVfsStdSym_QueryInfo,
+        NULL,
         RTVFSOBJOPS_VERSION
     },
@@ -668 +669 @@
         rtVfsStdDir_Close,
         rtVfsStdDir_QueryInfo,
+        NULL,
         RTVFSOBJOPS_VERSION
     },

trunk/src/VBox/Runtime/common/vfs/vfsstdfile.cpp

@@ -451 +451 @@
             rtVfsStdFile_Close,
             rtVfsStdFile_QueryInfo,
+            NULL,
             RTVFSOBJOPS_VERSION
         },

trunk/src/VBox/Runtime/common/vfs/vfsstdpipe.cpp

@@ -256 +256 @@
         rtVfsStdPipe_Close,
         rtVfsStdPipe_QueryInfo,
+        NULL,
         RTVFSOBJOPS_VERSION
     },