Changeset 75336 in vbox for trunk/src/VBox/HostServices

Timestamp:

Nov 9, 2018 1:25:29 AM (6 years ago)

Author:

vboxsync

Message:

SharedFolders/vbsfRename: Use RTPathRename if both SHFL_RENAME_FILE and SHFL_RENAME_DIR are set (would previously call RTFileMove in this case). Corrected harmless use of wrong flag constants in validation checks.

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• shflhandle.h (modified) (3 diffs)
• vbsf.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedFolders/shflhandle.h

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * Shared Folders:
- * Handles helper functions header.
+ * Shared Folders Host Service - Handles helper functions header.
  */
 
@@ -17 +16 @@
  */
 
-#ifndef __SHFLHANDLE__H
-#define __SHFLHANDLE__H
+#ifndef ___SHFLHANDLE_H
+#define ___SHFLHANDLE_H
 
 #include "shfl.h"
@@ -76 +75 @@
                                     SHFLHANDLE handle);
 
-#endif /* __SHFLHANDLE__H */
+#endif /* !___SHFLHANDLE_H */

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

@@ -1904 +1904 @@
 
     /* Validate input */
-    if (   flags & ~(SHFL_REMOVE_FILE|SHFL_REMOVE_DIR|SHFL_RENAME_REPLACE_IF_EXISTS)
+    if (   flags & ~(SHFL_RENAME_FILE|SHFL_RENAME_DIR|SHFL_RENAME_REPLACE_IF_EXISTS)
         || pSrc == 0
         || pDest == 0)
@@ -1935 +1935 @@
         if (RT_SUCCESS(rc))
         {
-            if (flags & SHFL_RENAME_FILE)
+            if ((flags & (SHFL_RENAME_FILE | SHFL_RENAME_DIR)) == (SHFL_RENAME_FILE | SHFL_RENAME_DIR))
+            {
+                rc = RTPathRename(pszFullPathSrc, pszFullPathDest,
+                                  flags & SHFL_RENAME_REPLACE_IF_EXISTS ? RTPATHRENAME_FLAGS_REPLACE : 0);
+            }
+            else if (flags & SHFL_RENAME_FILE)
             {
                 rc = RTFileMove(pszFullPathSrc, pszFullPathDest,