Changeset 73037 in vbox for trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

Timestamp:

Jul 10, 2018 3:58:05 PM (7 years ago)

Author:

vboxsync

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

123591

Message:

Guest Control/Main: Cleaned up internal symlink handling for copyTo / copyFrom tasks.

File:

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

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

@@ -1110 +1110 @@
                 case FsObjType_Symlink:
                 {
-                    if (mSourceSpec.fFollowSymlinks)
+                    if (mSourceSpec.Type.Dir.fFollowSymlinks)
                     {
                         /** @todo Symlink handling from guest is not imlemented yet.
                          *        See IGuestSession::symlinkRead(). */
+                        LogRel2(("Guest Control: Warning: Symlink support on guest side not available, skipping \"%s\"",
+                                 strEntry.c_str()));
                     }
                     break;
@@ -1219 +1221 @@
                             case RTFS_TYPE_SYMLINK:
                             {
-                                if (mSourceSpec.fFollowSymlinks)
+                                if (mSourceSpec.Type.Dir.fFollowSymlinks)
                                 {
                                     Utf8Str strEntryAbs = strPathAbs + Utf8Str(Entry.szName);
@@ -1376 +1378 @@
         Utf8Str strDst = mDest;
 
+        bool    fFollowSymlinks;
+
         if (itSrc->enmType == FsObjType_Directory)
         {
@@ -1389 +1393 @@
                 strDst += Utf8StrFmt("%s", RTPathFilenameEx(strSrc.c_str(), mfPathStyle));
             }
-        }
-
-        LogFlowFunc(("strSrc=%s, strDst=%s\n", strSrc.c_str(), strDst.c_str()));
+
+            fFollowSymlinks = itSrc->Type.Dir.fFollowSymlinks;
+        }
+        else
+        {
+            fFollowSymlinks = itSrc->Type.File.fCopyFlags & FileCopyFlag_FollowLinks;
+        }
+
+        LogFlowFunc(("strSrc=%s, strDst=%s, fFollowSymlinks=%RTbool\n", strSrc.c_str(), strDst.c_str(), fFollowSymlinks));
 
         GuestFsObjData srcObjData; int rcGuest;
-        rc = mSession->i_fsQueryInfo(strSrc, itSrc->fFollowSymlinks ? TRUE : FALSE,
-                                     srcObjData, &rcGuest);
+        rc = mSession->i_fsQueryInfo(strSrc, fFollowSymlinks, srcObjData, &rcGuest);
         if (RT_FAILURE(rc))
         {
@@ -1752 +1761 @@
         AssertPtr(pList);
 
-        const bool     fFollowSymlinks   = pList->mSourceSpec.fFollowSymlinks;
-        const bool     fCopyIntoExisting = pList->mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_CopyIntoExisting;
-        const uint32_t fDirMode          = 0700; /** @todo Play safe by default; implement ACLs. */
+        bool     fCopyIntoExisting;
+        bool     fFollowSymlinks;
+        uint32_t fDirMode = 0700; /** @todo Play safe by default; implement ACLs. */
 
         LogFlowFunc(("List: srcRootAbs=%s, dstRootAbs=%s\n", pList->mSrcRootAbs.c_str(), pList->mDstRootAbs.c_str()));
@@ -1761 +1770 @@
         if (pList->mSourceSpec.enmType == FsObjType_Directory)
         {
-            rc = directoryCreate(pList->mDstRootAbs.c_str(), DirectoryCreateFlag_None, fDirMode, fFollowSymlinks);
+            fCopyIntoExisting = pList->mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_CopyIntoExisting;
+            fFollowSymlinks   = pList->mSourceSpec.Type.Dir.fFollowSymlinks;
+
+            rc = directoryCreate(pList->mDstRootAbs.c_str(), DirectoryCreateFlag_None, fDirMode,
+                                 pList->mSourceSpec.Type.Dir.fFollowSymlinks);
             if (   rc == VWRN_ALREADY_EXISTS
                 && !fCopyIntoExisting)
@@ -1768 +1781 @@
             }
         }
+        else if (pList->mSourceSpec.enmType == FsObjType_File)
+        {
+            fCopyIntoExisting = !(pList->mSourceSpec.Type.File.fCopyFlags & FileCopyFlag_NoReplace);
+            fFollowSymlinks   = pList->mSourceSpec.Type.File.fCopyFlags & FileCopyFlag_FollowLinks;
+        }
+        else
+            AssertFailed();
 
         FsEntries::const_iterator itEntry = pList->mVecEntries.begin();
@@ -1804 +1824 @@
                     LogFlowFunc(("File '%s': %s -> %s\n", pEntry->strPath.c_str(), strSrcAbs.c_str(), strDstAbs.c_str()));
                     if (!pList->mSourceSpec.fDryRun)
-                        rc = fileCopyToGuest(strSrcAbs, strDstAbs, FileCopyFlag_None);
+                        rc = fileCopyToGuest(strSrcAbs, strDstAbs, pList->mSourceSpec.Type.File.fCopyFlags);
                     break;