Changeset 71251 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 7, 2018 11:20:00 AM (7 years ago)

Author:

vboxsync

Message:

Guest Control/[Directory|File]CopyFrom: Factored out the fileCopyFrom session task routines to also implement copying entire directories from the guest within Main. Work in progress.

File:

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

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

@@ -219 +219 @@
         }
 
-        const char* GetSource() const
-        {
-            return mSource.c_str();
-        }
-
-        const char* GetFilter() const
-        {
-            return mFilter.c_str();
+        Utf8Str GetSource() const
+        {
+            return mSource;
+        }
+
+        Utf8Str GetFilter() const
+        {
+            return mFilter;
         }
 
@@ -1767 +1767 @@
     RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
-    Utf8Str strSource;
     const char *pszDst = NULL;
     bool fDryRun = false;
@@ -1853 +1852 @@
     for (unsigned long s = 0; s < vecSources.size(); s++)
     {
-        char *pszSrc = RTStrDup(vecSources[s].GetSource());
-        AssertPtrBreakStmt(pszSrc, vrc = VERR_NO_MEMORY);
-        const char *pszFilter = vecSources[s].GetFilter();
-        RT_NOREF(pszFilter);
-        /* pszFilter can be NULL if not set. */
+        Utf8Str strSrc    = vecSources[s].GetSource();
+        Utf8Str strFilter = vecSources[s].GetFilter();
+        RT_NOREF(strFilter);
+        /* strFilter can be NULL if not set. */
 
         if (fHostToGuest)
         {
-            if (RTFileExists(pszSrc))
+            if (RTFileExists(strSrc.c_str()))
             {
                 SafeArray<FileCopyFlag_T> copyFlags;
-                rc = pCtx->pGuestSession->FileCopyToGuest(Bstr(pszSrc).raw(), Bstr(pszDst).raw(),
+                rc = pCtx->pGuestSession->FileCopyToGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
                                                           ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
             }
-            else if (RTDirExists(pszSrc))
+            else if (RTDirExists(strSrc.c_str()))
             {
                 SafeArray<DirectoryCopyFlag_T> copyFlags;
                 copyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting);
-                rc = pCtx->pGuestSession->DirectoryCopyToGuest(Bstr(pszSrc).raw(), Bstr(pszDst).raw(),
+                rc = pCtx->pGuestSession->DirectoryCopyToGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
                                                                ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
             }
             else if (pCtx->cVerbose)
-                RTPrintf("Warning: \"%s\" does not exist or is not a file/directory, skipping ...\n", pszSrc);
+                RTPrintf("Warning: \"%s\" does not exist or is not a file/directory, skipping ...\n", strSrc.c_str());
         }
         else
         {
-            SafeArray<FileCopyFlag_T> copyFlags;
-            rc = pCtx->pGuestSession->FileCopyFromGuest(Bstr(pszSrc).raw(), Bstr(pszDst).raw(),
-                                                        ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
+            if (   strSrc.endsWith("/")
+                || strSrc.endsWith("\\"))
+            {
+                SafeArray<DirectoryCopyFlag_T> copyFlags;
+                copyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting);
+                rc = pCtx->pGuestSession->DirectoryCopyFromGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
+                                                                 ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
+            }
+            else
+            {
+                SafeArray<FileCopyFlag_T> copyFlags;
+                rc = pCtx->pGuestSession->FileCopyFromGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
+                                                            ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
+            }
         }
     }