Changeset 38561 in vbox

Timestamp:

Aug 29, 2011 7:15:48 PM (14 years ago)

Author:

vboxsync

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

73727

Message:

VBoxManage/GuestCtrl: Enable directory copying, bugfixes, some simplifications + IPRT usage.

File:

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

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

@@ -883 +883 @@
  *
  * @return  IPRT status code.
- * @param   pszSourceRoot           Source root path.
+ * @param   pszSourceRoot           Source root path. No trailing directory slash!
  * @param   pszSource               Actual source to transform. Must begin with
  *                                  the source root path!
@@ -897 +897 @@
     AssertPtrReturn(pszDest, VERR_INVALID_POINTER);
     AssertPtrReturn(ppszTranslated, VERR_INVALID_POINTER);
-
-    /* Source path must contain the source root! */
-    if (!RTPathStartsWith(pszSource, pszSourceRoot))
-        return VERR_INVALID_PARAMETER;
+    AssertReturn(RTPathStartsWith(pszSource, pszSourceRoot), VERR_INVALID_PARAMETER);
 
     /* Construct the relative dest destination path by "subtracting" the
@@ -909 +906 @@
      * translated = "d:\baz\bar\"
      */
-
-    size_t lenRoot = strlen(pszSourceRoot);
-    AssertReturn(lenRoot, VERR_INVALID_PARAMETER);
-    char *pszTranslated = RTStrDup(pszDest);
-    AssertReturn(pszTranslated, VERR_NO_MEMORY);
-    int vrc = RTStrAAppend(&pszTranslated, &pszSource[lenRoot]);
-    if (RT_FAILURE(vrc))
-        return vrc;
-
-    *ppszTranslated = pszTranslated;
-
-    return vrc;
+    char szTranslated[RTPATH_MAX];
+    size_t srcOff = strlen(pszSourceRoot);
+    AssertReturn(srcOff, VERR_INVALID_PARAMETER);
+    int rc = RTPathJoin(szTranslated, sizeof(szTranslated),
+                        pszDest, &pszSource[srcOff]);
+    if (RT_SUCCESS(rc))
+        *ppszTranslated = RTStrDup(szTranslated);
+    return rc;
 }
 
@@ -1002 +995 @@
     else /* ... or on the host. */
     {
-        rc = RTDirCreate(pszDir, 700);
+        rc = RTDirCreateFullPath(pszDir, 700);
         if (rc == VERR_ALREADY_EXISTS)
             rc = VINF_SUCCESS;
@@ -1214 +1207 @@
                               const char *pszSource, const char *pszFilter,
                               const char *pszDest, uint32_t fFlags,
-                              const char *pszSubDir /* For recursion */)
+                              const char *pszSubDir /* For recursion. */)
 {
     AssertPtrReturn(pContext, VERR_INVALID_POINTER);
@@ -1273 +1266 @@
                         char *pszNewSub = NULL;
                         if (pszSubDir)
-                            RTStrAPrintf(&pszNewSub, "%s/%s", pszSubDir, DirEntry.szName);
+                            pszNewSub = RTPathJoinA(pszSubDir, DirEntry.szName);
                         else
-                            RTStrAPrintf(&pszNewSub, "%s", DirEntry.szName);
+                        {
+                            pszNewSub = RTStrDup(DirEntry.szName);
+                            RTPathStripTrailingSlash(pszNewSub);
+                        }
 
                         if (pszNewSub)
@@ -1320 +1316 @@
                         if (RT_SUCCESS(rc))
                         {
-                            char *pszFileSource;
-                            if (RTStrAPrintf(&pszFileSource, "%s/%s",
-                                             szCurDir, DirEntry.szName))
+                            char *pszFileSource = RTPathJoinA(szCurDir, DirEntry.szName);
+                            if (pszFileSource)
                             {
                                 char *pszFileDest;
@@ -1367 +1362 @@
                              const char *pszSource, const char *pszFilter,
                              const char *pszDest, uint32_t fFlags,
-                             const char *pszSubDir /* For recursion */)
+                             const char *pszSubDir /* For recursion. */)
 {
     AssertPtrReturn(pContext, VERR_INVALID_POINTER);
@@ -1422 +1417 @@
                         char *pszNewSub = NULL;
                         if (pszSubDir)
-                            RTStrAPrintf(&pszNewSub, "%s/%s", pszSubDir, strDir.c_str());
+                            pszNewSub = RTPathJoinA(pszSubDir, strDir.c_str());
                         else
-                            RTStrAPrintf(&pszNewSub, "%s", strDir.c_str());
-
+                        {
+                            pszNewSub = RTStrDup(strDir.c_str());
+                            RTPathStripTrailingSlash(pszNewSub);
+                        }
                         if (pszNewSub)
                         {
@@ -1470 +1467 @@
                         if (RT_SUCCESS(rc))
                         {
-                            char *pszFileSource;
-                            if (RTStrAPrintf(&pszFileSource, "%s/%s",
-                                             szCurDir, strFile.c_str()))
+                            char *pszFileSource = RTPathJoinA(szCurDir, strFile.c_str());
+                            if (pszFileSource)
                             {
                                 char *pszFileDest;
@@ -1754 +1750 @@
         for (unsigned long s = 0; s < vecSources.size(); s++)
         {
-            const char *pszSource = vecSources[s].mSource.c_str();
+            char *pszSource = RTStrDup(vecSources[s].mSource.c_str());
+            AssertPtrBreakStmt(pszSource, vrc = VERR_NO_MEMORY);
             const char *pszFilter = vecSources[s].mFilter.c_str();
             if (!strlen(pszFilter))
@@ -1773 +1770 @@
             bool fIsFile = false;
             bool fExists;
-            Utf8Str Utf8CurSource(pszSource);
-            if (   Utf8CurSource.endsWith("/")
-                || Utf8CurSource.endsWith("\\"))
-            {
-#ifndef DEBUG_andy
-                if (pContext->fHostToGuest)
-                {
-#endif
-                    if (pszFilter) /* Directory with filter. */
-                        vrc = ctrlCopyDirExistsOnSource(pContext, pszSourceRoot, &fExists);
-                    else /* Regular directory without filter. */
-                        vrc = ctrlCopyDirExistsOnSource(pContext, pszSource, &fExists);
-#ifndef DEBUG_andy
-                }
-                else
-                {
-                    RTMsgError("Copying of guest directories to the host is not supported yet!\n");
-                    vrc = VERR_NOT_IMPLEMENTED;
-                }
-#endif
+
+            size_t cchSource = strlen(pszSource);
+            if (   cchSource > 1
+                && RTPATH_IS_SLASH(pszSource[cchSource - 1]))
+            {
+                if (pszFilter) /* Directory with filter (so use source root w/o the actual filter). */
+                    vrc = ctrlCopyDirExistsOnSource(pContext, pszSourceRoot, &fExists);
+                else /* Regular directory without filter. */
+                    vrc = ctrlCopyDirExistsOnSource(pContext, pszSource, &fExists);
+
+                /* Strip trailing slash from our source element so that other functions
+                 * can use this stuff properly (like RTPathStartsWith). */
+                RTPathStripTrailingSlash(pszSource);
             }
             else
@@ -1799 +1789 @@
                 if (   RT_SUCCESS(vrc)
                     && fExists)
+                {
                     fIsFile = true;
-            }
-
-            if (RT_SUCCESS(vrc))
+                }
+            }
+
+            if (   RT_SUCCESS(vrc)
+                && fExists)
             {
                 if (fIsFile)
@@ -1837 +1830 @@
                 RTMsgError("Warning: Source \"%s\" does not exist, skipping!\n",
                            pszSource);
+                RTStrFree(pszSource);
                 continue;
             }
-
-            if (RT_FAILURE(vrc))
+            else if (RT_FAILURE(vrc))
             {
                 RTMsgError("Error processing \"%s\", rc=%Rrc\n",
                            pszSource, vrc);
-                break;
-            }
+                RTStrFree(pszSource);
+                break;
+            }
+
+            RTStrFree(pszSource);
         }
     }