Changeset 6831 in vbox

Timestamp:

Feb 6, 2008 3:16:36 PM (17 years ago)

Author:

vboxsync

Message:

First bugfix for shared folder guest -> host copying. Now overwriting of files works again (was broken in former builds).

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -631 +631 @@
     /* Open or create a file. */
     unsigned fOpen = 0;
+        bool fNoError = false;
+
     int rc = vbsfConvertFileOpenFlags(pParms->CreateFlags, &fOpen);
     if (RT_SUCCESS(rc))
@@ -664 +666 @@
             }
             pParms->Result = SHFL_FILE_EXISTS;
+
+                        /* This actually isn't an error, because the file simply already exists, 
+                           so correct the rc before return later, to make the driver (VBoxSF.sys) happy. */
+                        fNoError = true;        
             break;
         default:
@@ -669 +675 @@
         }
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -738 +745 @@
         pParms->Handle = handle;
     }
+
+        /* Report the driver that all is okay, we're done here */
+        if (fNoError) 
+                rc = VINF_SUCCESS;
+
     LogFlow(("vbsfOpenFile: rc = %Vrc\n", rc));
     return rc;
@@ -797 +809 @@
         }
         if (   RT_SUCCESS(rc)
-            || (   SHFL_CF_ACT_OPEN_IF_EXISTS
-                == BIT_FLAG(pParms->CreateFlags, SHFL_CF_ACT_MASK_IF_EXISTS)))
+            || (SHFL_CF_ACT_OPEN_IF_EXISTS == BIT_FLAG(pParms->CreateFlags, SHFL_CF_ACT_MASK_IF_EXISTS))
+                        || (SHFL_FILE_EXISTS == pParms->Result))        /* Call of RTDirCreate() avbove failed, because already existing? */
         {
             /* Open the directory now */