Changeset 75095 in vbox

Timestamp:

Oct 26, 2018 12:35:32 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Better check for existing directories in GuestSessionTaskCopyTo().

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1810 +1810 @@
                     {
                         rc = directoryCreate(strDstAbs.c_str(), DirectoryCreateFlag_None, fDirMode, fFollowSymlinks);
-                        if (   rc == VERR_ALREADY_EXISTS
-                            && !fCopyIntoExisting)
+                        if (RT_FAILURE(rc))
                         {
-                            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                Utf8StrFmt(GuestSession::tr("Destination directory \"%s\" already exists"),
-                                                           strDstAbs.c_str()));
-                            break;
+                            if (rc == VERR_ALREADY_EXISTS)
+                            {
+                                if (!fCopyIntoExisting)
+                                {
+                                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                        Utf8StrFmt(GuestSession::tr("Destination directory '%s' already exists"),
+                                                                   strDstAbs.c_str()));
+                                }
+                                else /* Copy into destination directory. */
+                                    rc = VINF_SUCCESS;
+                            }
                         }
                     }