Changeset 33793 in vbox

Timestamp:

Nov 5, 2010 2:21:25 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage/Guest Copy: Destination path construction + normalization.

File:

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

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

@@ -612 +612 @@
  *                              directory; needed for recursion.
  * @param   pszFilter           Search filter (e.g. *.pdf).
+ * @param   pszDest             Destination directory.
  * @param   uFlags              Copy flags.
  * @param   pcObjects           Where to store the overall objects to
@@ -617 +618 @@
  * @param   pList               Pointer to the object list to use.
  */
-int ctrlCopyDirectoryRead(const char *pszRootDir, const char *pszSubDir, const char *pszFilter,
+int ctrlCopyDirectoryRead(const char *pszRootDir, const char *pszSubDir,
+                          const char *pszFilter, const char *pszDest,
                           uint32_t uFlags, uint32_t *pcObjects, PRTLISTNODE pList)
 {
@@ -623 +625 @@
     /* Sub directory is optional. */
     /* Filter directory is optional. */
+    AssertPtrReturn(pszDest, VERR_INVALID_POINTER);
     AssertPtrReturn(pcObjects, VERR_INVALID_POINTER);
     AssertPtrReturn(pList, VERR_INVALID_POINTER);
@@ -673 +676 @@
                         if (pszNewSub)
                         {
-                            rc = ctrlCopyDirectoryRead(pszRootDir, pszNewSub, pszFilter,
+                            rc = ctrlCopyDirectoryRead(pszRootDir, pszNewSub,
+                                                       pszFilter, pszDest,
                                                        uFlags, pcObjects, pList);
                             RTStrFree(pszNewSub);
@@ -707 +711 @@
                                          DirEntry.szName) >= 0)
                         {
-                            if (RTStrAPrintf(&pszFileDest, "%s%s",
-                                             pszSubDir ? pszSubDir : "",
+                            if (RTStrAPrintf(&pszFileDest, "%s%s%s",
+                                             pszDest, pszSubDir ? pszSubDir : "",
                                              DirEntry.szName) <= 0)
                             {
@@ -771 +775 @@
             && RTFileExists(pszSourceAbs)) /* We have a single file ... */
         {
-            RTListInit(pList);
-            rc = ctrlCopyDirectoryEntryAppend(pszSourceAbs, pszDest, pList);
-            *pcObjects = 1;
+            char *pszDestAbs = RTStrDup(pszDest);
+            if (pszDestAbs)
+            {
+                RTPathStripFilename(pszDestAbs);
+                rc = RTStrAAppend(&pszDestAbs, RTPATH_SLASH_STR);
+                if (RT_SUCCESS(rc))
+                    rc = RTStrAAppend(&pszDestAbs, RTPathFilename(pszSourceAbs));
+
+                RTListInit(pList);
+                rc = ctrlCopyDirectoryEntryAppend(pszSourceAbs, pszDestAbs, pList);
+                *pcObjects = 1;
+
+                RTStrFree(pszDestAbs);
+            }
+            else
+                rc = VERR_NO_MEMORY;
         }
         else /* ... or a directory. */
@@ -784 +801 @@
             char *pszFilter = RTPathFilename(pszSourceAbs);
             char *pszSourceAbsRoot = RTStrDup(pszSourceAbs);
-            if (pszSourceAbsRoot)
+            char *pszDestAbs = RTStrDup(pszDest);
+            if (   pszSourceAbsRoot
+                && pszDestAbs)
             {
                 if (pszFilter)
@@ -809 +828 @@
                 if (RT_SUCCESS(rc))
                 {
+                    /*
+                     * Make sure we have a valid destination path. All we can do
+                     * here is to check whether we have a trailing slash -- the rest
+                     * (i.e. path creation, rights etc.) needs to be done inside the guest.
+                     */
+                    size_t cch = strlen(pszDestAbs);
+                    if (    cch > 1
+                        &&  !RTPATH_IS_SLASH(pszDestAbs[cch - 1])
+                        &&  !RTPATH_IS_SLASH(pszDestAbs[cch - 2]))
+                    {
+                        rc = RTStrAAppend(&pszDestAbs, RTPATH_SLASH_STR);
+                    }
+                }
+
+                if (RT_SUCCESS(rc))
+                {
                     RTListInit(pList);
                     rc = ctrlCopyDirectoryRead(pszSourceAbsRoot, NULL /* Sub directory */,
-                                               pszFilter,
+                                               pszFilter, pszDestAbs,
                                                uFlags, pcObjects, pList);
                     if (RT_SUCCESS(rc) && *pcObjects == 0)
@@ -817 +852 @@
                 }
 
-                RTStrFree(pszSourceAbsRoot);
+                if (pszDestAbs)
+                    RTStrFree(pszDestAbs);
+                if (pszSourceAbsRoot)
+                    RTStrFree(pszSourceAbsRoot);
             }
             else
@@ -1174 +1212 @@
                     {
                         if (fVerbose)
+#ifndef DEBUG
                             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);
+#endif
                         /* Finally copy the desired file (if no dry run selected). */
                         if (!fDryRun)