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

Timestamp:

Dec 6, 2017 12:26:37 PM (7 years ago)

Author:

vboxsync

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

119457

Message:

IPRT/vfs: Made pfnSetMode, pfnSetTimes, pfnSetOwner and pfnWrite optional and fallback to VERR_WRITE_PROTECT.

File:

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

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

@@ -81 +81 @@
         Assert((a_pSetOps)->uVersion == RTVFSOBJSETOPS_VERSION); \
         Assert((a_pSetOps)->offObjOps == (a_offObjOps)); \
-        AssertPtr((a_pSetOps)->pfnSetMode); \
-        AssertPtr((a_pSetOps)->pfnSetTimes); \
-        AssertPtr((a_pSetOps)->pfnSetOwner); \
+        AssertPtrNull((a_pSetOps)->pfnSetMode); \
+        AssertPtrNull((a_pSetOps)->pfnSetTimes); \
+        AssertPtrNull((a_pSetOps)->pfnSetOwner); \
         Assert((a_pSetOps)->uEndMarker == RTVFSOBJSETOPS_VERSION); \
     } while (0)
@@ -113 +113 @@
         Assert(!((pIoStreamOps)->fFeatures & ~RTVFSIOSTREAMOPS_FEAT_VALID_MASK)); \
         AssertPtr((pIoStreamOps)->pfnRead); \
-        AssertPtr((pIoStreamOps)->pfnWrite); \
+        AssertPtrNull((pIoStreamOps)->pfnWrite); \
         AssertPtr((pIoStreamOps)->pfnFlush); \
         AssertPtrNull((pIoStreamOps)->pfnPollOne); \
@@ -126 +126 @@
     do { \
         RTVFSOBJ_ASSERT_OPS(&(pSymlinkOps)->Obj, a_enmType); \
-        RTVFSOBJSET_ASSERT_OPS(&(pSymlinkOps)->ObjSet, \
-            RT_OFFSETOF(RTVFSSYMLINKOPS, Obj) - RT_OFFSETOF(RTVFSSYMLINKOPS, ObjSet)); \
+        RTVFSOBJSET_ASSERT_OPS(&(pSymlinkOps)->ObjSet, RT_OFFSETOF(RTVFSSYMLINKOPS, Obj) - RT_OFFSETOF(RTVFSSYMLINKOPS, ObjSet)); \
         Assert((pSymlinkOps)->uVersion == RTVFSSYMLINKOPS_VERSION); \
         Assert(!(pSymlinkOps)->fReserved); \
@@ -1317 +1316 @@
     AssertReturn(pObjSetOps, VERR_INVALID_FUNCTION);
 
-    RTVfsLockAcquireWrite(pThis->hLock);
-    int rc = pObjSetOps->pfnSetMode(pThis->pvThis, fMode, fMask);
-    RTVfsLockReleaseWrite(pThis->hLock);
+    int rc;
+    if (pObjSetOps->pfnSetMode)
+    {
+        RTVfsLockAcquireWrite(pThis->hLock);
+        rc = pObjSetOps->pfnSetMode(pThis->pvThis, fMode, fMask);
+        RTVfsLockReleaseWrite(pThis->hLock);
+    }
+    else
+        rc = VERR_WRITE_PROTECT;
     return rc;
 }
@@ -1339 +1344 @@
     AssertReturn(pObjSetOps, VERR_INVALID_FUNCTION);
 
-    RTVfsLockAcquireWrite(pThis->hLock);
-    int rc = pObjSetOps->pfnSetTimes(pThis->pvThis, pAccessTime, pModificationTime, pChangeTime, pBirthTime);
-    RTVfsLockReleaseWrite(pThis->hLock);
+    int rc;
+    if (pObjSetOps->pfnSetTimes)
+    {
+        RTVfsLockAcquireWrite(pThis->hLock);
+        rc = pObjSetOps->pfnSetTimes(pThis->pvThis, pAccessTime, pModificationTime, pChangeTime, pBirthTime);
+        RTVfsLockReleaseWrite(pThis->hLock);
+    }
+    else
+        rc = VERR_WRITE_PROTECT;
     return rc;
 }
@@ -1355 +1366 @@
     AssertReturn(pObjSetOps, VERR_INVALID_FUNCTION);
 
-    RTVfsLockAcquireWrite(pThis->hLock);
-    int rc = pObjSetOps->pfnSetOwner(pThis->pvThis, uid, gid);
-    RTVfsLockReleaseWrite(pThis->hLock);
+    int rc;
+    if (pObjSetOps->pfnSetOwner)
+    {
+        RTVfsLockAcquireWrite(pThis->hLock);
+        rc = pObjSetOps->pfnSetOwner(pThis->pvThis, uid, gid);
+        RTVfsLockReleaseWrite(pThis->hLock);
+    }
+    else
+        rc = VERR_WRITE_PROTECT;
     return rc;
 }
@@ -3499 +3516 @@
     AssertReturn(pThis->fFlags & RTFILE_O_WRITE, VERR_ACCESS_DENIED);
 
-    RTSGSEG Seg = { (void *)pvBuf, cbToWrite };
-    RTSGBUF SgBuf;
-    RTSgBufInit(&SgBuf, &Seg, 1);
-
-    RTVfsLockAcquireWrite(pThis->Base.hLock);
-    int rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, -1 /*off*/, &SgBuf, fBlocking, pcbWritten);
-    RTVfsLockReleaseWrite(pThis->Base.hLock);
+    int rc;
+    if (pThis->pOps->pfnWrite)
+    {
+        RTSGSEG Seg = { (void *)pvBuf, cbToWrite };
+        RTSGBUF SgBuf;
+        RTSgBufInit(&SgBuf, &Seg, 1);
+
+        RTVfsLockAcquireWrite(pThis->Base.hLock);
+        rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, -1 /*off*/, &SgBuf, fBlocking, pcbWritten);
+        RTVfsLockReleaseWrite(pThis->Base.hLock);
+    }
+    else
+        rc = VERR_WRITE_PROTECT;
     return rc;
 }
@@ -3522 +3545 @@
     AssertReturn(pThis->fFlags & RTFILE_O_WRITE, VERR_ACCESS_DENIED);
 
-    RTSGSEG Seg = { (void *)pvBuf, cbToWrite };
-    RTSGBUF SgBuf;
-    RTSgBufInit(&SgBuf, &Seg, 1);
-
-    RTVfsLockAcquireWrite(pThis->Base.hLock);
-    int rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, off, &SgBuf, fBlocking, pcbWritten);
-    RTVfsLockReleaseWrite(pThis->Base.hLock);
+    int rc;
+    if (pThis->pOps->pfnWrite)
+    {
+        RTSGSEG Seg = { (void *)pvBuf, cbToWrite };
+        RTSGBUF SgBuf;
+        RTSgBufInit(&SgBuf, &Seg, 1);
+
+        RTVfsLockAcquireWrite(pThis->Base.hLock);
+        rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, off, &SgBuf, fBlocking, pcbWritten);
+        RTVfsLockReleaseWrite(pThis->Base.hLock);
+    }
+    else
+        rc = VERR_WRITE_PROTECT;
     return rc;
 }
@@ -3590 +3619 @@
     AssertReturn(pThis->fFlags & RTFILE_O_WRITE, VERR_ACCESS_DENIED);
 
-    RTVfsLockAcquireWrite(pThis->Base.hLock);
     int rc;
-    if (!(pThis->pOps->fFeatures & RTVFSIOSTREAMOPS_FEAT_NO_SG))
-        rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, off, pSgBuf, fBlocking, pcbWritten);
+    if (pThis->pOps->pfnWrite)
+    {
+        RTVfsLockAcquireWrite(pThis->Base.hLock);
+        if (!(pThis->pOps->fFeatures & RTVFSIOSTREAMOPS_FEAT_NO_SG))
+            rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, off, pSgBuf, fBlocking, pcbWritten);
+        else
+        {
+            size_t cbWritten = 0;
+            rc = VINF_SUCCESS;
+
+            for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
+            {
+                RTSGBUF SgBuf;
+                RTSgBufInit(&SgBuf, &pSgBuf->paSegs[iSeg], 1);
+
+                size_t cbWrittenSeg = 0;
+                rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, off, &SgBuf, fBlocking, pcbWritten ? &cbWrittenSeg : NULL);
+                if (RT_FAILURE(rc))
+                    break;
+                if (pcbWritten)
+                {
+                    cbWritten += cbWrittenSeg;
+                    if (cbWrittenSeg != SgBuf.paSegs[0].cbSeg)
+                        break;
+                    if (off != -1)
+                        off += cbWrittenSeg;
+                }
+                else if (off != -1)
+                    off += pSgBuf->paSegs[iSeg].cbSeg;
+            }
+
+            if (pcbWritten)
+                *pcbWritten = cbWritten;
+        }
+        RTVfsLockReleaseWrite(pThis->Base.hLock);
+    }
     else
-    {
-        size_t cbWritten = 0;
-        rc = VINF_SUCCESS;
-
-        for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
-        {
-            RTSGBUF SgBuf;
-            RTSgBufInit(&SgBuf, &pSgBuf->paSegs[iSeg], 1);
-
-            size_t cbWrittenSeg = 0;
-            rc = pThis->pOps->pfnWrite(pThis->Base.pvThis, off, &SgBuf, fBlocking, pcbWritten ? &cbWrittenSeg : NULL);
-            if (RT_FAILURE(rc))
-                break;
-            if (pcbWritten)
-            {
-                cbWritten += cbWrittenSeg;
-                if (cbWrittenSeg != SgBuf.paSegs[0].cbSeg)
-                    break;
-                if (off != -1)
-                    off += cbWrittenSeg;
-            }
-            else if (off != -1)
-                off += pSgBuf->paSegs[iSeg].cbSeg;
-        }
-
-        if (pcbWritten)
-            *pcbWritten = cbWritten;
-    }
-    RTVfsLockReleaseWrite(pThis->Base.hLock);
+        rc = VERR_WRITE_PROTECT;
     return rc;
 }