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

Timestamp:

Apr 19, 2017 7:29:36 PM (8 years ago)

Author:

vboxsync

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

114658

Message:

IPRT: More FAT fun (couldn't stop myself).

File:

• trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (6 diffs)

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

@@ -80 +80 @@
         AssertPtr((a_pSetOps)->pfnSetOwner); \
         Assert((a_pSetOps)->uEndMarker == RTVFSOBJSETOPS_VERSION); \
+    } while (0)
+
+/** Asserts that the VFS directory vtable is valid. */
+#define RTVFSDIR_ASSERT_OPS(pDirOps, a_enmType) \
+    do { \
+        RTVFSOBJ_ASSERT_OPS(&(pDirOps)->Obj, a_enmType); \
+        RTVFSOBJSET_ASSERT_OPS(&(pDirOps)->ObjSet, RT_OFFSETOF(RTVFSDIROPS, Obj) - RT_OFFSETOF(RTVFSDIROPS, ObjSet)); \
+        Assert((pDirOps)->uVersion == RTVFSDIROPS_VERSION); \
+        Assert(!(pDirOps)->fReserved); \
+        AssertPtr((pDirOps)->pfnTraversalOpen); \
+        AssertPtr((pDirOps)->pfnOpenFile); \
+        AssertPtr((pDirOps)->pfnOpenDir); \
+        AssertPtr((pDirOps)->pfnCreateDir); \
+        AssertPtr((pDirOps)->pfnOpenSymlink); \
+        AssertPtr((pDirOps)->pfnCreateSymlink); \
+        AssertPtr((pDirOps)->pfnUnlinkEntry); \
+        AssertPtr((pDirOps)->pfnRewindDir); \
+        AssertPtr((pDirOps)->pfnReadDir); \
+        Assert((pDirOps)->uEndMarker == RTVFSDIROPS_VERSION); \
     } while (0)
 
@@ -1634 +1653 @@
     AssertReturn(pVfsOps->uVersion   == RTVFSOPS_VERSION, VERR_VERSION_MISMATCH);
     AssertReturn(pVfsOps->uEndMarker == RTVFSOPS_VERSION, VERR_VERSION_MISMATCH);
+    RTVFSOBJ_ASSERT_OPS(&pVfsOps->Obj, RTVFSOBJTYPE_VFS);
     Assert(cbInstance > 0);
     AssertPtr(ppvInstance);
@@ -1647 +1667 @@
         return VERR_NO_MEMORY;
 
-    int rc = rtVfsObjInitNewObject(&pThis->Base, NULL, hVfs, hLock,
+    int rc = rtVfsObjInitNewObject(&pThis->Base, &pVfsOps->Obj, hVfs, hLock,
                                    (char *)pThis + RT_ALIGN_Z(sizeof(*pThis), RTVFS_INST_ALIGNMENT));
     if (RT_FAILURE(rc))
@@ -1660 +1680 @@
     *phVfs       = pThis;
     *ppvInstance = pThis->Base.pvThis;
+
     return VINF_SUCCESS;
 }
@@ -1832 +1853 @@
  *
  */
+
+
+RTDECL(int) RTVfsNewDir(PCRTVFSDIROPS pDirOps, size_t cbInstance, uint32_t fFlags, RTVFS hVfs, RTVFSLOCK hLock,
+                        PRTVFSDIR phVfsDir, void **ppvInstance)
+{
+    /*
+     * Validate the input, be extra strict in strict builds.
+     */
+    AssertPtr(pDirOps);
+    AssertReturn(pDirOps->uVersion   == RTVFSDIROPS_VERSION, VERR_VERSION_MISMATCH);
+    AssertReturn(pDirOps->uEndMarker == RTVFSDIROPS_VERSION, VERR_VERSION_MISMATCH);
+    Assert(!pDirOps->fReserved);
+    RTVFSDIR_ASSERT_OPS(pDirOps, RTVFSOBJTYPE_DIR);
+    Assert(cbInstance > 0);
+    AssertReturn(!fFlags, VERR_INVALID_FLAGS);
+    AssertPtr(ppvInstance);
+    AssertPtr(phVfsDir);
+    RTVFS_ASSERT_VALID_HANDLE_OR_NIL_RETURN(hVfs, VERR_INVALID_HANDLE);
+
+    /*
+     * Allocate the handle + instance data.
+     */
+    size_t const cbThis = RT_ALIGN_Z(sizeof(RTVFSDIRINTERNAL), RTVFS_INST_ALIGNMENT)
+                        + RT_ALIGN_Z(cbInstance, RTVFS_INST_ALIGNMENT);
+    RTVFSDIRINTERNAL *pThis = (RTVFSDIRINTERNAL *)RTMemAllocZ(cbThis);
+    if (!pThis)
+        return VERR_NO_MEMORY;
+
+    int rc = rtVfsObjInitNewObject(&pThis->Base, &pDirOps->Obj, hVfs, hLock,
+                                   (char *)pThis + RT_ALIGN_Z(sizeof(*pThis), RTVFS_INST_ALIGNMENT));
+    if (RT_FAILURE(rc))
+    {
+        RTMemFree(pThis);
+        return rc;
+    }
+
+    pThis->uMagic       = RTVFSDIR_MAGIC;
+    pThis->fReserved    = 0;
+    pThis->pOps         = pDirOps;
+
+    *phVfsDir    = pThis;
+    *ppvInstance = pThis->Base.pvThis;
+    return VINF_SUCCESS;
+}
+
 
 RTDECL(uint32_t) RTVfsDirRetain(RTVFSDIR hVfsDir)
@@ -2801 +2867 @@
 
 
+RTDECL(int) RTVfsFileSgRead(RTVFSFILE hVfsFile, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead)
+{
+    AssertPtrNullReturn(pcbRead, VERR_INVALID_POINTER);
+    if (pcbRead)
+        *pcbRead = 0;
+    RTVFSFILEINTERNAL *pThis = hVfsFile;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->uMagic == RTVFSFILE_MAGIC, VERR_INVALID_HANDLE);
+
+    return RTVfsIoStrmSgRead(&pThis->Stream, off, pSgBuf, fBlocking, pcbRead);
+}
+
+
+RTDECL(int) RTVfsFileSgWrite(RTVFSFILE hVfsFile, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten)
+{
+    AssertPtrNullReturn(pcbWritten, VERR_INVALID_POINTER);
+    if (pcbWritten)
+        *pcbWritten = 0;
+    RTVFSFILEINTERNAL *pThis = hVfsFile;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->uMagic == RTVFSFILE_MAGIC, VERR_INVALID_HANDLE);
+
+    return RTVfsIoStrmSgWrite(&pThis->Stream, off, pSgBuf, fBlocking, pcbWritten);
+}
+
+
 RTDECL(int) RTVfsFileFlush(RTVFSFILE hVfsFile)
 {