Changeset 85491 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jul 28, 2020 4:31:44 PM (4 years ago)

Author:

vboxsync

Message:

IPRT/RTFileCopyPartEx-linux.cpp: Fix fallback handling if the syscall is present but cannot handle the copying (it is documented that for a range of kernels it cannot handle cross-filesystem copying).

File:

• trunk/src/VBox/Runtime/r3/linux/RTFileCopyPartEx-linux.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/linux/RTFileCopyPartEx-linux.cpp

@@ -124 +124 @@
     AssertReturn(pBufState->uMagic == RTFILECOPYPARTBUFSTATE_MAGIC, VERR_INVALID_FLAGS);
     if (pBufState->iAllocType == -42)
-    { /* more and more likley as time goes */ }
+    { /* more and more likely as time goes */ }
     else
         return rtFileCopyPartExFallback(hFileSrc, offSrc, hFileDst, offDst, cbToCopy, fFlags, pBufState, pcbCopied);
@@ -155 +155 @@
             Assert(rc != 0);
             rc = rc != 0 ? RTErrConvertFromErrno(rc) : VERR_READ_ERROR;
-            break;
+            if (rc != VERR_NOT_SAME_DEVICE || cbCopied != 0)
+                break;
+
+            /* Fall back to generic implementation if the syscall refuses to handle the case. */
+            rc = rtFileCopyPartPrepFallback(pBufState, cbToCopy);
+            if (RT_SUCCESS(rc))
+                return rtFileCopyPartExFallback(hFileSrc, offSrc, hFileDst, offDst, cbToCopy, fFlags, pBufState, pcbCopied);
+            return rc;
         }
         Assert(offThisSrc == offSrc + (int64_t)cbCopied + cbActual);