Changeset 33809 in vbox

Timestamp:

Nov 5, 2010 6:19:15 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage/Guest Copy: Avoid path duplication.

File:

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

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

@@ -1198 +1198 @@
                 PDIRECTORYENTRY pNode;
                 uint32_t uCurObject = 1;
-                char szDest[RTPATH_MAX];
                 RTListForEach(&listToCopy, pNode, DIRECTORYENTRY, Node)
                 {
-                    /*
-                     * Build final destination path: Append the relative path
-                     * stored in the directory node to the destination directory
-                     * specified on the command line.
-                     */
-                    szDest[0] = '\0'; /* Terminate string, needed for RTPathAppend(). */
-                    vrc = RTPathAppend(szDest, sizeof(szDest), Utf8Dest.c_str());
-                    if (RT_SUCCESS(vrc))
-                        vrc = RTPathAppend(szDest, sizeof(szDest), pNode->pszDestPath);
-
-                    if (RT_SUCCESS(vrc))
-                    {
-                        if (fVerbose)
+                    if (fVerbose)
 #ifndef DEBUG
-                            RTPrintf("Copying \"%s\" (%u/%u) ...\n",
-                                     pNode->pszSourcePath, uCurObject, cObjects);
+                        RTPrintf("Copying \"%s\" (%u/%u) ...\n",
+                                 pNode->pszSourcePath, uCurObject, cObjects);
 #else
-                            RTPrintf("Copying \"%s\" to \"%s\" (%u/%u) ...\n",
-                                     pNode->pszSourcePath, pNode->pszDestPath, uCurObject, cObjects);
+                        RTPrintf("Copying \"%s\" to \"%s\" (%u/%u) ...\n",
+                                 pNode->pszSourcePath, pNode->pszDestPath, uCurObject, cObjects);
 #endif
-                        /* Finally copy the desired file (if no dry run selected). */
-                        if (!fDryRun)
-                            vrc = ctrlCopyFileToGuest(guest, pNode->pszSourcePath, szDest,
-                                                      Utf8UserName.c_str(), Utf8Password.c_str(), uFlags);
-                    }
-                    else
-                        RTMsgError("Error building destination file name, rc=%Rrc\n", vrc);
+                    /* Finally copy the desired file (if no dry run selected). */
+                    if (!fDryRun)
+                        vrc = ctrlCopyFileToGuest(guest, pNode->pszSourcePath, pNode->pszDestPath,
+                                                  Utf8UserName.c_str(), Utf8Password.c_str(), uFlags);
                     if (RT_FAILURE(vrc))
                         break;