Changeset 71319 in vbox

Timestamp:

Mar 14, 2018 12:25:05 PM (7 years ago)

Author:

vboxsync

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

121268

Message:

Guest Control/VBoxManage: Check the source element to copy from guest to know whether to use IGuestSession::fileCopyTo() or IGuestSession::directoryCopyTo().

File:

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

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

@@ -1861 +1861 @@
             if (RTFileExists(strSrc.c_str()))
             {
+                if (pCtx->cVerbose)
+                    RTPrintf("File '%s' -> '%s'\n", strSrc.c_str(), pszDst);
+
                 SafeArray<FileCopyFlag_T> copyFlags;
                 rc = pCtx->pGuestSession->FileCopyToGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
@@ -1867 +1870 @@
             else if (RTDirExists(strSrc.c_str()))
             {
+                if (pCtx->cVerbose)
+                    RTPrintf("Directory '%s' -> '%s'\n", strSrc.c_str(), pszDst);
+
                 SafeArray<DirectoryCopyFlag_T> copyFlags;
                 copyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting);
@@ -1877 +1883 @@
         else
         {
-            if (   strSrc.endsWith("/")
-                || strSrc.endsWith("\\"))
-            {
+            /* We need to query the source type on the guest first in order to know which copy flavor we need. */
+            ComPtr<IGuestFsObjInfo> pFsObjInfo;
+            FsObjType_T enmObjType = FsObjType_Unknown; /* Shut up MSC */
+            rc = pCtx->pGuestSession->FsObjQueryInfo(Bstr(strSrc).raw(), TRUE  /* fFollowSymlinks */, pFsObjInfo.asOutParam());
+            if (SUCCEEDED(rc))
+                rc = pFsObjInfo->COMGETTER(Type)(&enmObjType);
+            if (FAILED(rc))
+            {
+                if (pCtx->cVerbose)
+                    RTPrintf("Warning: Cannot stat for element '%s': No such element\n", strSrc.c_str());
+                continue; /* Skip. */
+            }
+
+            if (enmObjType == FsObjType_Directory)
+            {
+                if (pCtx->cVerbose)
+                    RTPrintf("Directory '%s' -> '%s'\n", strSrc.c_str(), pszDst);
+
                 SafeArray<DirectoryCopyFlag_T> copyFlags;
                 copyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting);
@@ -1885 +1906 @@
                                                                  ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
             }
-            else
-            {
+            else if (enmObjType == FsObjType_File)
+            {
+                if (pCtx->cVerbose)
+                    RTPrintf("File '%s' -> '%s'\n", strSrc.c_str(), pszDst);
+
                 SafeArray<FileCopyFlag_T> copyFlags;
                 rc = pCtx->pGuestSession->FileCopyFromGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
                                                             ComSafeArrayAsInParam(copyFlags), pProgress.asOutParam());
             }
+            else if (pCtx->cVerbose)
+                RTPrintf("Warning: Skipping '%s': Not handled\n", strSrc.c_str());
         }
     }