Changeset 97395 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

Timestamp:

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

Author:

vboxsync

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

154395

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/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -694 +694 @@
          * into existing directories on the guest. This otherwise would fail (default): */
         else if (enmFileType == KFsObjType_Directory)
+        {
+            /* Make sure that if the source is a directory, that we append a trailing delimiter to it,
+             * so that it gets copied *into* the destination directory as a whole, and not just it's contents. */
+            strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestinationPath);
             aFlags << strDirectoryFlags;
+        }
         else
             aFlags << strFileFlags;
@@ -744 +749 @@
     }
 
+    QString strDestinationPath = hostDestinationPath;
     QString strDirectoryFlags("CopyIntoExisting,Recursive,FollowLinks");
     QString strFileFlags;
@@ -760 +766 @@
 
         if (fileType(fileInfo) == KFsObjType_Directory)
+        {
+            /* Make sure that if the source is a directory, that we append a trailing delimiter to the destination,
+             * so that the source directory gets copied *into* the destination directory as a whole, and not
+             * just it's contents. */
+            strDestinationPath = UIPathOperations::addTrailingDelimiters(strDestinationPath);
             aFlags << strDirectoryFlags;
+        }
         else
             aFlags << strFileFlags;
     }
 
-    CProgress progress = m_comGuestSession.CopyFromGuest(sourcePaths, aFilters, aFlags, hostDestinationPath);
+    CProgress progress = m_comGuestSession.CopyFromGuest(sourcePaths, aFilters, aFlags, strDestinationPath);
     if (!checkGuestSession())
         return;