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

Timestamp:

Mar 7, 2008 2:46:00 PM (17 years ago)

Author:

vboxsync

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

28794

Message:

A little adjustment of the RTFILECOPY flags.

File:

• trunk/src/VBox/Runtime/r3/fileio.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/fileio.cpp

@@ -327 +327 @@
     AssertMsgReturn(*pszDst, ("pszDst=%p\n", pszDst), VERR_INVALID_PARAMETER);
     AssertMsgReturn(!pfnProgress || VALID_PTR(pfnProgress), ("pfnProgress=%p\n", pfnProgress), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!(fFlags & ~RTFILECOPY_FLAGS_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
 
     /*
@@ -332 +333 @@
      */
     RTFILE FileSrc;
-    uint32_t fSrcOpen = RTFILE_O_READ | RTFILE_O_OPEN;
-    if (!(fFlags & RTFILECOPY_FLAG_NO_DENY_WRITE))
-        fSrcOpen |= RTFILE_O_DENY_WRITE;
-    int rc = RTFileOpen(&FileSrc, pszSrc, fSrcOpen);
+    int rc = RTFileOpen(&FileSrc, pszSrc,
+                        RTFILE_O_READ | (fFlags & RTFILECOPY_FLAGS_NO_SRC_DENY_WRITE ? 0 : RTFILE_O_DENY_WRITE) | RTFILE_O_OPEN);
     if (RT_SUCCESS(rc))
     {
         RTFILE FileDst;
-        rc = RTFileOpen(&FileDst, pszDst, RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE);
+        rc = RTFileOpen(&FileDst, pszDst,
+                        RTFILE_O_READ | (fFlags & RTFILECOPY_FLAGS_NO_DST_DENY_WRITE ? 0 : RTFILE_O_DENY_WRITE) | RTFILE_O_OPEN);
         if (RT_SUCCESS(rc))
         {