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

Timestamp:

Nov 11, 2010 5:16:37 PM (14 years ago)

Author:

vboxsync

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

67667

Message:

iprt: Working on tar vfs.

File:

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

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

@@ -68 +68 @@
 /** The max number of symbolic links to resolve in a path. */
 #define RTVFS_MAX_LINKS             20U
+
+
+/** Asserts that the VFS base object vtable is valid. */
+#define RTVFSOBJ_ASSERT_OPS(pObj, enmTypeArg) \
+    do \
+    { \
+        Assert((pObj)->uVersion == RTVFSOBJOPS_VERSION); \
+        Assert((pObj)->enmType == (enmTypeArg) || (enmTypeArg) == RTVFSOBJTYPE_INVALID); \
+        AssertPtr((pObj)->pszName); \
+        Assert(*(pObj)->pszName); \
+        AssertPtr((pObj)->pfnClose); \
+        AssertPtr((pObj)->pfnQueryInfo); \
+        Assert((pObj)->uEndMarker == RTVFSOBJOPS_VERSION); \
+    } while (0)
+
+/** Asserts that the VFS I/O stream vtable is valid. */
+#define RTVFSIOSTREAM_ASSERT_OPS(pIoStreamOps, enmTypeArg) \
+    do { \
+        RTVFSOBJ_ASSERT_OPS(&(pIoStreamOps)->Obj, enmTypeArg); \
+        Assert((pIoStreamOps)->uVersion == RTVFSIOSTREAMOPS_VERSION); \
+        Assert(!(pIoStreamOps)->fReserved); \
+        AssertPtr((pIoStreamOps)->pfnRead); \
+        AssertPtr((pIoStreamOps)->pfnWrite); \
+        AssertPtr((pIoStreamOps)->pfnFlush); \
+        AssertPtr((pIoStreamOps)->pfnPollOne); \
+        AssertPtr((pIoStreamOps)->pfnTell); \
+        AssertPtrNull((pIoStreamOps)->pfnSkip); \
+        AssertPtrNull((pIoStreamOps)->pfnZeroFill); \
+        Assert((pIoStreamOps)->uEndMarker == RTVFSIOSTREAMOPS_VERSION); \
+    } while (0)
 
 
@@ -1095 +1125 @@
                              PRTVFSFSSTREAM phVfsFss, void **ppvInstance)
 {
-    return VERR_NOT_IMPLEMENTED;
+    /*
+     * Validate the input, be extra strict in strict builds.
+     */
+    AssertPtr(pFsStreamOps);
+    AssertReturn(pFsStreamOps->uVersion   == RTVFSFSSTREAMOPS_VERSION, VERR_VERSION_MISMATCH);
+    AssertReturn(pFsStreamOps->uEndMarker == RTVFSFSSTREAMOPS_VERSION, VERR_VERSION_MISMATCH);
+    Assert(!pFsStreamOps->fReserved);
+    RTVFSOBJ_ASSERT_OPS(&pFsStreamOps->Obj, RTVFSOBJTYPE_FS_STREAM);
+    AssertPtr(pFsStreamOps->pfnNext);
+    Assert(cbInstance > 0);
+    AssertPtr(ppvInstance);
+    AssertPtr(phVfsFss);
+
+    RTVFSINTERNAL *pVfs = NULL;
+    if (hVfs != NIL_RTVFS)
+    {
+        pVfs = hVfs;
+        AssertPtrReturn(pVfs, VERR_INVALID_HANDLE);
+        AssertReturn(pVfs->uMagic == RTVFS_MAGIC, VERR_INVALID_HANDLE);
+    }
+
+    /*
+     * Allocate the handle + instance data.
+     */
+    size_t const cbThis = RT_ALIGN_Z(sizeof(RTVFSFSSTREAMINTERNAL), RTVFS_INST_ALIGNMENT)
+                        + RT_ALIGN_Z(cbInstance, RTVFS_INST_ALIGNMENT);
+    RTVFSFSSTREAMINTERNAL *pThis = (RTVFSFSSTREAMINTERNAL *)RTMemAllocZ(cbThis);
+    if (!pThis)
+        return VERR_NO_MEMORY;
+
+    pThis->uMagic       = RTVFSFSSTREAM_MAGIC;
+    pThis->fFlags       = RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE;
+    pThis->pOps         = pFsStreamOps;
+    pThis->Base.uMagic  = RTVFSOBJ_MAGIC;
+    pThis->Base.pvThis  = (char *)pThis + RT_ALIGN_Z(sizeof(*pThis), RTVFS_INST_ALIGNMENT);
+    pThis->Base.pOps    = &pFsStreamOps->Obj;
+    pThis->Base.hSemRW  = hSemRW != NIL_RTSEMRW ? hSemRW : pVfs ? pVfs->Base.hSemRW : NIL_RTSEMRW;
+    pThis->Base.hVfs    = hVfs;
+    pThis->Base.cRefs   = 1;
+    if (hVfs != NIL_RTVFS)
+        rtVfsObjRetainVoid(&pVfs->Base);
+
+    *phVfsFss    = pThis;
+    *ppvInstance = pThis->Base.pvThis;
+    return VINF_SUCCESS;
 }
 
@@ -1233 +1307 @@
     AssertReturn(pIoStreamOps->uEndMarker == RTVFSIOSTREAMOPS_VERSION, VERR_VERSION_MISMATCH);
     Assert(!pIoStreamOps->fReserved);
+    RTVFSIOSTREAM_ASSERT_OPS(pIoStreamOps, RTVFSOBJTYPE_IO_STREAM);
     Assert(cbInstance > 0);
     Assert(fOpen & RTFILE_O_ACCESS_MASK);
@@ -1539 +1614 @@
     AssertReturn(pFileOps->uEndMarker == RTVFSFILEOPS_VERSION, VERR_VERSION_MISMATCH);
     Assert(!pFileOps->fReserved);
+    RTVFSIOSTREAM_ASSERT_OPS(&pFileOps->Stream, RTVFSOBJTYPE_FILE);
     Assert(cbInstance > 0);
     Assert(fOpen & RTFILE_O_ACCESS_MASK);