Changeset 75848 in vbox

Timestamp:

Nov 30, 2018 12:23:17 PM (6 years ago)

Author:

vboxsync

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

127051

Message:

VBoxManage/guestcontrol: copyto/from hacking

File:

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

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

@@ -186 +186 @@
 } GCTLCMDCTX, *PGCTLCMDCTX;
 
-/**
- * An entry for a source element, including an optional DOS-like wildcard (*,?).
- */
-class SourceFileEntry
-{
-public:
-    SourceFileEntry(const char *pszSource, const char *pszFilter)
-        : mSource(pszSource)
-        , mFilter(pszFilter)
-    {}
-
-    SourceFileEntry(const char *pszSource)
-    {
-/** @todo Using host parsing rules for guest filenames might be undesirable... */
-
-        /* Look for filter and split off the filter part if present. */
-        const char *pszFilename = RTPathFilename(pszSource);
-        if (   !pszFilename
-            || !strpbrk(pszFilename, "*?"))
-            mSource.assign(pszSource);
-        else
-        {
-            mFilter = pszFilename;
-            size_t cch = pszFilename - pszSource;
-            if (cch > 0 && pszFilename[-1] != ':')
-                cch--;
-            mSource.assign(pszSource, cch);
-        }
-    }
-
-    const Utf8Str &GetSource() const
-    {
-        return mSource;
-    }
-
-    const Utf8Str &GetFilter() const
-    {
-        return mFilter;
-    }
-
-protected:
-    Utf8Str mSource;
-    Utf8Str mFilter;
-};
-typedef std::vector<SourceFileEntry> SourceVec;
 
 /**
@@ -1736 +1691 @@
     RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, RTGETOPTINIT_FLAGS_OPTS_FIRST);
 
+    bool fDstMustBeDir = false;
     const char *pszDst = NULL;
     bool fFollow = false;
@@ -1741 +1697 @@
     uint32_t uUsage = fHostToGuest ? USAGE_GSTCTRL_COPYTO : USAGE_GSTCTRL_COPYFROM;
 
-    SourceVec vecSources;
-
     int vrc = VINF_SUCCESS;
-    while ((ch = RTGetOpt(&GetState, &ValueUnion)) != 0)
+    while (  (ch = RTGetOpt(&GetState, &ValueUnion)) != 0
+           && ch != VINF_GETOPT_NOT_OPTION)
     {
         /* For options that require an argument, ValueUnion has received the value. */
@@ -1761 +1716 @@
             case GETOPTDEF_COPY_TARGETDIR:
                 pszDst = ValueUnion.psz;
-                break;
-
-            case VINF_GETOPT_NOT_OPTION:
-                /* Last argument and no destination specified with --target-directory yet?
-                   Then use the current (= last) argument as destination. */
-                if (   GetState.argc == GetState.iNext
-                    && pszDst == NULL)
-                    pszDst = ValueUnion.psz;
-                else
-                {
-                    try
-                    {
-                        vecSources.push_back(SourceFileEntry(ValueUnion.psz));
-                    }
-                    catch (std::bad_alloc &)
-                    {
-                        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Out of memory");
-                    }
-                }
+                fDstMustBeDir = true;
                 break;
 
@@ -1787 +1724 @@
     }
 
-    if (!vecSources.size())
+    char **papszSources = RTGetOptNonOptionArrayPtr(&GetState);
+    size_t cSources = &argv[argc] - papszSources;
+
+    if (!cSources)
         return errorSyntaxEx(USAGE_GUESTCONTROL, uUsage, "No sources specified!");
+
+    /* Unless a --target-directory is given, the last argument is the destination, so
+       bump it from the source list. */
+    if (pszDst == NULL && cSources >= 2)
+        pszDst = papszSources[--cSources];
 
     if (pszDst == NULL)
@@ -1820 +1765 @@
     HRESULT           rc = S_OK;
     ComPtr<IProgress> pProgress;
-
 /** @todo r=bird: This codes does nothing to handle the case where there are
  * multiple sources.  You need to do serveral thing before thats handled
@@ -1835 +1779 @@
  * The handling of the wildcard filtering expressions in sources was also just
  * skipped.   I've corrected this, but you still need to make up your mind wrt
- * wildcards or not.
+ * wildcards or not. 
+ * 
+ * Update: I've kicked out the whole SourceFileEntry/vecSources stuff as we can
+ *         use argv directly without any unnecessary copying.  You just have to
+ *         look for the wildcards inside this loop instead.
  */
-    if (vecSources.size() != 1)
+    NOREF(fDstMustBeDir);
+    if (cSources != 1)
         return RTMsgErrorExitFailure("Only one source file or directory at the moment.");
-    for (size_t s = 0; s < vecSources.size(); s++)
-    {
-        Utf8Str const &strSrc    = vecSources[s].GetSource();
-        Utf8Str const &strFilter = vecSources[s].GetFilter();
-
-        RT_NOREF(strFilter);
-        if (strFilter.isNotEmpty())
-            rcExit = RTMsgErrorExitFailure("Skipping '%s/%s' because wildcard expansion isn't implemented yet\n",
-                                           strSrc.c_str(),  strFilter.c_str());
+    for (size_t iSrc = 0; iSrc < cSources; iSrc++)
+    {
+        const char *pszSource = papszSources[iSrc];
+
+        /* Check if the source contains any wilecards in the last component, if so we
+           don't know how to deal with it yet and refuse. */
+        const char *pszSrcFinalComp = RTPathFilename(pszSource);
+        if (pszSrcFinalComp && strpbrk(pszSrcFinalComp, "*?"))
+            rcExit = RTMsgErrorExitFailure("Skipping '%s' because wildcard expansion isn't implemented yet\n", pszSource);
         else if (fHostToGuest)
         {
@@ -1854 +1803 @@
              */
             char szAbsSrc[RTPATH_MAX];
-            vrc = RTPathAbs(strSrc.c_str(), szAbsSrc, sizeof(szAbsSrc));
+            vrc = RTPathAbs(pszSource, szAbsSrc, sizeof(szAbsSrc));
             if (RT_SUCCESS(vrc))
             {
@@ -1887 +1836 @@
             }
             else
-                rcExit = RTMsgErrorExitFailure("RTPathAbs failed on '%s': %Rrc", strSrc.c_str());
+                rcExit = RTMsgErrorExitFailure("RTPathAbs failed on '%s': %Rrc", pszSource);
         }
         else
@@ -1896 +1845 @@
             /* We need to query the source type on the guest first in order to know which copy flavor we need. */
             ComPtr<IGuestFsObjInfo> pFsObjInfo;
-            rc = pCtx->pGuestSession->FsObjQueryInfo(Bstr(strSrc).raw(), TRUE  /* fFollowSymlinks */, pFsObjInfo.asOutParam());
+            rc = pCtx->pGuestSession->FsObjQueryInfo(Bstr(pszSource).raw(), TRUE  /* fFollowSymlinks */, pFsObjInfo.asOutParam());
             if (SUCCEEDED(rc))
             {
@@ -1907 +1856 @@
                     {
                         if (pCtx->cVerbose)
-                            RTPrintf("Directory '%s' -> '%s'\n", strSrc.c_str(), pszDst);
+                            RTPrintf("Directory '%s' -> '%s'\n", pszSource, pszDst);
 
                         SafeArray<DirectoryCopyFlag_T> aCopyFlags;
                         aCopyFlags.push_back(DirectoryCopyFlag_CopyIntoExisting);
-                        rc = pCtx->pGuestSession->DirectoryCopyFromGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
+                        rc = pCtx->pGuestSession->DirectoryCopyFromGuest(Bstr(pszSource).raw(), Bstr(pszDst).raw(),
                                                                          ComSafeArrayAsInParam(aCopyFlags), pProgress.asOutParam());
                     }
@@ -1917 +1866 @@
                     {
                         if (pCtx->cVerbose)
-                            RTPrintf("File '%s' -> '%s'\n", strSrc.c_str(), pszDst);
+                            RTPrintf("File '%s' -> '%s'\n", pszSource, pszDst);
 
                         SafeArray<FileCopyFlag_T> aCopyFlags;
-                        rc = pCtx->pGuestSession->FileCopyFromGuest(Bstr(strSrc).raw(), Bstr(pszDst).raw(),
+                        rc = pCtx->pGuestSession->FileCopyFromGuest(Bstr(pszSource).raw(), Bstr(pszDst).raw(),
                                                                     ComSafeArrayAsInParam(aCopyFlags), pProgress.asOutParam());
                     }
                     else
-                        rcExit = RTMsgErrorExitFailure("Not a file or directory: %s\n", strSrc.c_str());
+                        rcExit = RTMsgErrorExitFailure("Not a file or directory: %s\n", pszSource);
                 }
                 else
@@ -1930 +1879 @@
             }
             else
-                rcExit = RTMsgErrorExitFailure("FsObjQueryInfo failed on '%s': %Rrc", strSrc.c_str());
+                rcExit = RTMsgErrorExitFailure("FsObjQueryInfo failed on '%s': %Rhrc", pszSource, rc);
         }
     }