Changeset 92912 in vbox

Timestamp:

Dec 15, 2021 8:08:43 AM (3 years ago)

Author:

vboxsync

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

148868

Message:

FE/Qt: bugref:9371. Fixing a bug related to file copy calls

File:

• trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp (modified) (4 diffs)

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

@@ -614 +614 @@
         return;
     }
-
+    QString strDirectoryFlags("CopyIntoExisting,Recursive,FollowLinks");
+    QString strFileFlags;
     foreach (const QString &strSource, sourcePaths)
     {
@@ -622 +623 @@
         {
             /* If the source is an directory, make sure to add the appropriate flag to make copying work
-             * into existing directories on the guest. This otherwise would fail (default). */
+             * into existing directories on the guest. This otherwise would fail (default): */
             if (RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode))
-            {
-                aFlags.append("CopyIntoExisting");
-                aFlags.append("Recursive");
-                aFlags.append("FollowLinks");
-            }
-            else /* Make sure to keep the vector in sync with the number of source items by adding an empty entry. */
-                aFlags.append("");
+                aFlags << strDirectoryFlags;
+            else
+                aFlags << strFileFlags;
         }
         else
@@ -679 +676 @@
     }
 
+    QString strDirectoryFlags("CopyIntoExisting,Recursive,FollowLinks");
+    QString strFileFlags;
     foreach (const QString &strSource, sourcePaths)
     {
@@ -692 +691 @@
         }
 
-        KFsObjType eType = fileType(fileInfo);
-        if (eType == KFsObjType_Directory)
-        {
-            aFlags.append("CopyIntoExisting");
-            aFlags.append("Recursive");
-            aFlags.append("FollowLinks");
-        }
-        else /* Make sure to keep the vector in sync with the number of source items by adding an empty entry. */
-            aFlags.append("");
+        if (fileType(fileInfo) == KFsObjType_Directory)
+            aFlags << strDirectoryFlags;
+        else
+            aFlags << strFileFlags;
     }