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

Timestamp:

May 7, 2020 8:56:01 PM (5 years ago)

Author:

vboxsync

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

137800

Message:

IPRT: Adding RTZIPTAR_C_UPDATE, RTZipTarFsStreamForFile and RTZipTarFsStreamTruncate. Also added some new VFS functions and changed the fReadOnly argument of RTVfsNewFsStream into RTFILE_O_ACCESS_MASK, so it is possible to specify read+write. Untested. bugref:9699

Location:

trunk/src/VBox/Runtime/common/vfs

Files:

• vfsbase.cpp (modified) (5 diffs)
• vfsfss2dir.cpp (modified) (2 diffs)

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

@@ -813 +813 @@
     *ppvInstance = pThis->pvThis;
     return VINF_SUCCESS;
+}
+
+
+RTDECL(void *) RTVfsObjToPrivate(RTVFSOBJ hVfsObj, PCRTVFSOBJOPS pObjOps)
+{
+    RTVFSOBJINTERNAL *pThis = hVfsObj;
+    AssertPtrReturn(pThis, NULL);
+    AssertReturn(pThis->uMagic == RTVFSOBJ_MAGIC, NULL);
+    if (pThis->pOps != pObjOps)
+        return NULL;
+    return pThis->pvThis;
 }
 
@@ -2282 +2293 @@
 
 
-RTDECL(int) RTVfsNewFsStream(PCRTVFSFSSTREAMOPS pFsStreamOps, size_t cbInstance, RTVFS hVfs, RTVFSLOCK hLock, bool fReadOnly,
+RTDECL(int) RTVfsNewFsStream(PCRTVFSFSSTREAMOPS pFsStreamOps, size_t cbInstance, RTVFS hVfs, RTVFSLOCK hLock, uint32_t fAccess,
                              PRTVFSFSSTREAM phVfsFss, void **ppvInstance)
 {
@@ -2293 +2304 @@
     Assert(!pFsStreamOps->fReserved);
     RTVFSOBJ_ASSERT_OPS(&pFsStreamOps->Obj, RTVFSOBJTYPE_FS_STREAM);
-    if (fReadOnly)
+    Assert((fAccess & (RTFILE_O_READ | RTFILE_O_WRITE)) == fAccess);
+    Assert(fAccess);
+    if (fAccess & RTFILE_O_READ)
         AssertPtr(pFsStreamOps->pfnNext);
-    else
+    if (fAccess & RTFILE_O_WRITE)
     {
         AssertPtr(pFsStreamOps->pfnAdd);
@@ -2324 +2337 @@
 
     pThis->uMagic = RTVFSFSSTREAM_MAGIC;
-    pThis->fFlags = fReadOnly
-                  ? RTFILE_O_READ  | RTFILE_O_OPEN   | RTFILE_O_DENY_NONE
-                  : RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_ALL;
     pThis->pOps   = pFsStreamOps;
+    pThis->fFlags = fAccess;
+    if (fAccess == RTFILE_O_READ)
+        pThis->fFlags |= RTFILE_O_OPEN   | RTFILE_O_DENY_NONE;
+    else if (fAccess == RTFILE_O_WRITE)
+        pThis->fFlags |= RTFILE_O_CREATE | RTFILE_O_DENY_ALL;
+    else
+        pThis->fFlags |= RTFILE_O_OPEN   | RTFILE_O_DENY_ALL;
 
     *phVfsFss     = pThis;
@@ -3277 +3294 @@
 
 
+RTDECL(void *) RTVfsSymlinkToPrivate(RTVFSSYMLINK hVfsSym, PCRTVFSSYMLINKOPS pSymlinkOps)
+{
+    RTVFSSYMLINKINTERNAL *pThis = hVfsSym;
+    AssertPtrReturn(pThis, NULL);
+    AssertReturn(pThis->uMagic == RTVFSSYMLINK_MAGIC, NULL);
+    if (pThis->pOps != pSymlinkOps)
+        return NULL;
+    return pThis->Base.pvThis;
+}
+
+
 RTDECL(uint32_t)    RTVfsSymlinkRetain(RTVFSSYMLINK hVfsSym)
 {

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

@@ -311 +311 @@
     PRTVFSFSSWRITE2DIR      pThis;
     RTVFSFSSTREAM           hVfsFss;
-    int rc = RTVfsNewFsStream(&g_rtVfsFssToDirOps, sizeof(*pThis), NIL_RTVFS, NIL_RTVFSLOCK, false /*fReadOnly*/,
+    int rc = RTVfsNewFsStream(&g_rtVfsFssToDirOps, sizeof(*pThis), NIL_RTVFS, NIL_RTVFSLOCK, RTFILE_O_WRITE,
                               &hVfsFss, (void **)&pThis);
     if (RT_SUCCESS(rc))
@@ -370 +370 @@
                 RTVFSFSSTREAM           hVfsFss;
                 rc = RTVfsNewFsStream(&g_rtVfsFssToDirOps, RT_UOFFSETOF_DYN(RTVFSFSSWRITE2DIR, szBaseDir[cbBaseDir]),
-                                      NIL_RTVFS, NIL_RTVFSLOCK, false /*fReadOnly*/, &hVfsFss, (void **)&pThis);
+                                      NIL_RTVFS, NIL_RTVFSLOCK, RTFILE_O_WRITE, &hVfsFss, (void **)&pThis);
                 if (RT_SUCCESS(rc))
                 {