Changeset 92822 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 8, 2021 2:55:45 PM (3 years ago)

Author:

vboxsync

Message:

Guest Control: Resolved a @todo: Implemented DirectoryCopyFlag_Recursive + DirectoryCopyFlag_FollowLinks and no longer do this implicitly internally.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestSessionImpl.cpp (modified) (7 diffs)
• GuestSessionImplTasks.cpp (modified) (8 diffs)

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

@@ -869 +869 @@
                 if (MATCH_KEYWORD("CopyIntoExisting"))
                     fFlags |= (unsigned)DirectoryCopyFlag_CopyIntoExisting;
+                else if (MATCH_KEYWORD("Recursive"))
+                    fFlags |= (unsigned)DirectoryCopyFlag_Recursive;
+                else if (MATCH_KEYWORD("FollowLinks"))
+                    fFlags |= (unsigned)DirectoryCopyFlag_FollowLinks;
                 else
                     return setError(E_INVALIDARG, tr("Invalid directory copy flag: %.*s"), (int)cchKeyword, pszNext);
@@ -3201 +3205 @@
         {
             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(strFlags, &source.Type.File.fCopyFlags);
         else
-            return setError(E_INVALIDARG, tr("Source type %d invalid / not supported"), source.enmType);
+            return setError(E_INVALIDARG, tr("Source type %#x invalid / not supported"), source.enmType);
         if (FAILED(hrc))
             return hrc;
@@ -3272 +3275 @@
         {
             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(strFlags, &source.Type.File.fCopyFlags);
         else
-            return setError(E_INVALIDARG, tr("Source type %d invalid / not supported"), source.enmType);
+            return setError(E_INVALIDARG, tr("Source type %#x invalid / not supported"), source.enmType);
         if (FAILED(hrc))
             return hrc;
@@ -3314 +3315 @@
             fFlags |= aFlags[i];
 
-        const uint32_t fValidFlags = DirectoryCopyFlag_None | DirectoryCopyFlag_CopyIntoExisting;
+        const uint32_t fValidFlags =   DirectoryCopyFlag_None | DirectoryCopyFlag_CopyIntoExisting | DirectoryCopyFlag_Recursive
+                                     | DirectoryCopyFlag_FollowLinks;
         if (fFlags & ~fValidFlags)
             return setError(E_INVALIDARG,tr("Unknown flags: flags value %#x, invalid: %#x"), fFlags, fFlags & ~fValidFlags);
@@ -3327 +3329 @@
     source.fDryRun              = false; /** @todo Implement support for a dry run. */
     source.Type.Dir.fCopyFlags  = (DirectoryCopyFlag_T)fFlags;
-    source.Type.Dir.fRecursive  = true; /* Implicit. */
 
     SourceSet.push_back(source);
@@ -3343 +3344 @@
             fFlags |= aFlags[i];
 
-        const uint32_t fValidFlags = DirectoryCopyFlag_None | DirectoryCopyFlag_CopyIntoExisting;
+        const uint32_t fValidFlags =   DirectoryCopyFlag_None | DirectoryCopyFlag_CopyIntoExisting | DirectoryCopyFlag_Recursive
+                                     | DirectoryCopyFlag_FollowLinks;
         if (fFlags & ~fValidFlags)
             return setError(E_INVALIDARG,tr("Unknown flags: flags value %#x, invalid: %#x"), fFlags, fFlags & ~fValidFlags);
@@ -3356 +3358 @@
     source.fDryRun             = false; /** @todo Implement support for a dry run. */
     source.Type.Dir.fCopyFlags = (DirectoryCopyFlag_T)fFlags;
-    source.Type.Dir.fFollowSymlinks = true; /** @todo Add a flag for that in DirectoryCopyFlag_T. Later. */
-    source.Type.Dir.fRecursive      = true; /* Implicit. */
 
     SourceSet.push_back(source);

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

@@ -1004 +1004 @@
      *       will be done directly when working on those. See @bugref{10139}. */
 
-    LogFlowFunc(("mSrcRootAbs=%s, mDstRootAbs=%s, fCopyFlags=%#x, fFollowSymlinks=%RTbool, fRecursive=%RTbool\n",
-                 mSrcRootAbs.c_str(), mDstRootAbs.c_str(), mSourceSpec.Type.Dir.fCopyFlags,
-                 mSourceSpec.Type.Dir.fFollowSymlinks, mSourceSpec.Type.Dir.fRecursive));
+    LogFlowFunc(("mSrcRootAbs=%s, mDstRootAbs=%s, fCopyFlags=%#x\n",
+                 mSrcRootAbs.c_str(), mDstRootAbs.c_str(), mSourceSpec.Type.Dir.fCopyFlags));
 
     return VINF_SUCCESS;
@@ -1123 +1122 @@
                     LogRel2(("Guest Control: Directory '%s'\n", strEntry.c_str()));
 
-                    if (!(mSourceSpec.Type.Dir.fRecursive))
+                    if (!(mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_Recursive))
                         break;
 
@@ -1132 +1131 @@
                 case FsObjType_Symlink:
                 {
-                    if (mSourceSpec.Type.Dir.fFollowSymlinks)
+                    if (mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_FollowLinks)
                     {
                         /** @todo Symlink handling from guest is not implemented yet.
@@ -1234 +1233 @@
                                 LogRel2(("Guest Control: Directory '%s'\n", strEntry.c_str()));
 
-                                if (!(mSourceSpec.Type.Dir.fRecursive))
+                                if (!(mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_Recursive))
                                     break;
 
@@ -1251 +1250 @@
                             case RTFS_TYPE_SYMLINK:
                             {
-                                if (mSourceSpec.Type.Dir.fFollowSymlinks)
+                                if (mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_FollowLinks)
                                 {
                                     Utf8Str strEntryAbs = strPathAbs + Utf8Str(Entry.szName);
@@ -1443 +1442 @@
                 }
 
-                fFollowSymlinks = itSrc->Type.Dir.fFollowSymlinks;
+                fFollowSymlinks = itSrc->Type.Dir.fCopyFlags & DirectoryCopyFlag_FollowLinks;
             }
             else
@@ -1838 +1837 @@
         GuestFsObjData dstObjData;
         int rcGuest;
-        rc = mSession->i_fsQueryInfo(strDstRootAbs, pList->mSourceSpec.Type.Dir.fFollowSymlinks, dstObjData, &rcGuest);
+        rc = mSession->i_fsQueryInfo(strDstRootAbs, pList->mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_FollowLinks,
+                                     dstObjData, &rcGuest);
         if (RT_FAILURE(rc))
         {
@@ -1879 +1879 @@
         {
             fCopyIntoExisting = RT_BOOL(pList->mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_CopyIntoExisting);
-            fFollowSymlinks   = pList->mSourceSpec.Type.Dir.fFollowSymlinks;
+            fFollowSymlinks   = RT_BOOL(pList->mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_FollowLinks);
 
             LogFlowFunc(("Directory: fDirCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool\n",