Changeset 7370 in vbox

Timestamp:

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

Author:

vboxsync

Message:

A little adjustment of the RTFILECOPY flags.

Location:

trunk

Files:

• include/iprt/file.h (modified) (1 diff)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/fileio.cpp (modified) (2 diffs)

trunk/include/iprt/file.h

@@ -343 +343 @@
  * @{ */
 /** Do not use RTFILE_O_DENY_WRITE on the source file to allow for copying files opened for writing. */
-#define RTFILECOPY_FLAG_NO_DENY_WRITE   0x0001
+#define RTFILECOPY_FLAGS_NO_SRC_DENY_WRITE  RT_BIT(0)
+/** Do not use RTFILE_O_DENY_WRITE on the target file. */
+#define RTFILECOPY_FLAGS_NO_DST_DENY_WRITE  RT_BIT(1)
+/** Do not use RTFILE_O_DENY_WRITE on either of the two file. */
+#define RTFILECOPY_FLAGS_NO_DENY_WRITE      ( RTFILECOPY_FLAGS_NO_SRC_DENY_WRITE | RTFILECOPY_FLAGS_NO_DST_DENY_WRITE )
+/** */
+#define RTFILECOPY_FLAGS_MASK               UINT32_C(0x00000003)
 /** @} */
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -4317 +4317 @@
     Utf8Str nf = Utf8StrFmt ("%s.%s.bak", of.raw(), aOldFormat.raw());
 
-    int vrc = RTFileCopyEx (of, nf, RTFILECOPY_FLAG_NO_DENY_WRITE,
+    int vrc = RTFileCopyEx (of, nf, RTFILECOPY_FLAGS_NO_SRC_DENY_WRITE,
                             NULL, NULL);
 
@@ -4327 +4327 @@
         {
             nf = Utf8StrFmt ("%s.%d", tmp.raw(), i);
-            vrc = RTFileCopyEx (of, nf, RTFILECOPY_FLAG_NO_DENY_WRITE,
+            vrc = RTFileCopyEx (of, nf, RTFILECOPY_FLAGS_NO_SRC_DENY_WRITE,
                                 NULL, NULL);
         }

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))
         {