Changeset 49683 in vbox for trunk/src

Timestamp:

Nov 27, 2013 3:42:13 PM (11 years ago)

Author:

vboxsync

Message:

FE/VBoxManage/GuestCtrl: Don't try to build up paths for the guest side when renaming.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)

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

@@ -1499 +1499 @@
         fCloseSession = !fDetached;
 
-        /* 
-         * If execution was aborted from the host side (signal handler), 
-         * close the guest session in any case. 
-         */ 
+        /*
+         * If execution was aborted from the host side (signal handler),
+         * close the guest session in any case.
+         */
         if (g_fGuestCtrlCanceled)
             fCloseSession = true;
@@ -2950 +2950 @@
         rc = pCtx->pGuestSession->DirectoryQueryInfo(Bstr(strDest).raw(), pFsObjInfo.asOutParam());
         if (FAILED(rc))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "Destination must be a directory\n");
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "Destination must be a directory when speciying multiple sources\n");
     }
 
@@ -2984 +2984 @@
             it++;
             continue; /* Skip. */
-        }
-
-        if (!fSourceIsDirectory)
-        {
-            char *pszFileName = RTPathFilename(strCurSource.c_str());
-            if (!pszFileName)
-            {
-                RTMsgError("Unable to extract file name from source \"%s\"",
-                           strCurSource.c_str());
-                break;
-            }
-
-            char szFileDest[RTPATH_MAX];
-            vrc = RTPathJoin(szFileDest, sizeof(szFileDest), strDest.c_str(), pszFileName);
-            if (RT_FAILURE(vrc))
-            {
-                RTMsgError("Unable to build destination name for source \"%s\", rc=%Rrc",
-                           strCurSource.c_str(), vrc);
-                break;
-            }
-
-            strCurDest = szFileDest;
         }