Changeset 74953 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 19, 2018 5:28:17 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Made the IGuestSession::copyToGuest() and IGuestSession::copyFromGuest() API calls more flexible in terms of not having to pass the flags and filter arrays. Untested.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2899 +2899 @@
 
     const size_t cSources = aSources.size();
-    if (   aFilters.size() != cSources
-        || aFlags.size()   != cSources)
+    if (   (aFilters.size() && aFilters.size() != cSources)
+        || (aFlags.size()   && aFlags.size()   != cSources))
     {
         return setError(E_INVALIDARG, tr("Parameter array sizes don't match to the number of sources specified"));
@@ -2929 +2929 @@
         }
 
+        Utf8Str strFlags;
+        if (itFlags != aFlags.end())
+        {
+            strFlags = *itFlags;
+            ++itFlags;
+        }
+
+        Utf8Str strFilter;
+        if (itFilter != aFilters.end())
+        {
+            strFilter = *itFilter;
+            ++itFilter;
+        }
+
         GuestSessionFsSourceSpec source;
         source.strSource    = *itSource;
-        source.strFilter    = *itFilter;
+        source.strFilter    = strFilter;
         source.enmType      = objData.mType;
         source.enmPathStyle = i_getPathStyle();
@@ -2938 +2952 @@
         if (source.enmType == FsObjType_Directory)
         {
-            hrc = GuestSession::i_directoryCopyFlagFromStr(*itFlags, &source.Type.Dir.fCopyFlags);
+            hrc = GuestSession::i_directoryCopyFlagFromStr(strFlags, &source.Type.Dir.fCopyFlags);
             source.Type.Dir.fRecursive = true; /* Implicit. */
         }
         else if (source.enmType == FsObjType_File)
-            hrc = GuestSession::i_fileCopyFlagFromStr(*itFlags, &source.Type.File.fCopyFlags);
+            hrc = GuestSession::i_fileCopyFlagFromStr(strFlags, &source.Type.File.fCopyFlags);
         else
             return setError(E_INVALIDARG, tr("Source type %d invalid / not supported"), source.enmType);
@@ -2951 +2965 @@
 
         ++itSource;
-        ++itFilter;
-        ++itFlags;
     }
 
@@ -2966 +2978 @@
 
     const size_t cSources = aSources.size();
-    if (   aFilters.size() != cSources
-        || aFlags.size()   != cSources)
+    if (   (aFilters.size() && aFilters.size() != cSources)
+        || (aFlags.size()   && aFlags.size()   != cSources))
     {
         return setError(E_INVALIDARG, tr("Parameter array sizes don't match to the number of sources specified"));
@@ -2990 +3002 @@
         }
 
+        Utf8Str strFlags;
+        if (itFlags != aFlags.end())
+        {
+            strFlags = *itFlags;
+            ++itFlags;
+        }
+
+        Utf8Str strFilter;
+        if (itFilter != aFilters.end())
+        {
+            strFilter = *itFilter;
+            ++itFilter;
+        }
+
         GuestSessionFsSourceSpec source;
         source.strSource    = *itSource;
-        source.strFilter    = *itFilter;
+        source.strFilter    = strFilter;
         source.enmType      = GuestBase::fileModeToFsObjType(objInfo.Attr.fMode);
         source.enmPathStyle = i_getPathStyle();
@@ -2999 +3025 @@
         if (source.enmType == FsObjType_Directory)
         {
-            hrc = GuestSession::i_directoryCopyFlagFromStr(*itFlags, &source.Type.Dir.fCopyFlags);
+            hrc = GuestSession::i_directoryCopyFlagFromStr(strFlags, &source.Type.Dir.fCopyFlags);
             source.Type.Dir.fFollowSymlinks = true; /** @todo Add a flag for that in DirectoryCopyFlag_T. Later. */
             source.Type.Dir.fRecursive      = true; /* Implicit. */
         }
         else if (source.enmType == FsObjType_File)
-            hrc = GuestSession::i_fileCopyFlagFromStr(*itFlags, &source.Type.File.fCopyFlags);
+            hrc = GuestSession::i_fileCopyFlagFromStr(strFlags, &source.Type.File.fCopyFlags);
         else
             return setError(E_INVALIDARG, tr("Source type %d invalid / not supported"), source.enmType);
@@ -3013 +3039 @@
 
         ++itSource;
-        ++itFilter;
-        ++itFlags;
     }