Changeset 97395 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

Timestamp:

Nov 4, 2022 11:17:21 AM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Rewrite of the path building and directory walking code for the copyFrom / copyTo guest session tasks, to (hopefully) have a cleaner structure. The new path building now also takes into account whether a destination has a trailing delimiter and then act accordingly (see rules in GuestPath::BuildDestinationPath()). Adjusted VBoxManage and FE/Qt to also reflect that; should now work as common tools like cp. Added new test cases and also re-enabled old ones which were disabled since quite a while (should pass now). ​bugref:10286

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -1750 +1750 @@
         if (fRecursive && fIsDir) /* Only available for directories. Just ignore otherwise. */
             strCopyFlags += "Recursive,";
-        if (fIsDir)
-            strCopyFlags += "CopyIntoExisting,"; /* Implicit. */
         if (fFollow)
             strCopyFlags += "FollowLinks,";
-        if (fUpdate && !fIsDir)    /* Only affects files. */
+        if (fUpdate)    /* Only copy source files which are newer than the destination file. */
             strCopyFlags += "Update,";
-        if (fNoReplace && !fIsDir) /* Ditto. */
+        if (fNoReplace) /* Do not overwrite files. */
             strCopyFlags += "NoReplace,";
+        else if (!fNoReplace && fIsDir)
+            strCopyFlags += "CopyIntoExisting,"; /* Only copy into existing directories if "--no-replace" isn't specified. */
        aCopyFlags.push_back(Bstr(strCopyFlags).raw());
     }