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

Timestamp:

Nov 15, 2022 5:07:35 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Also support copying files from the guest to symbolic links on the host. bugref:10286

File:

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

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

@@ -1673 +1673 @@
         bool            fDstExists        = true;
 
-        RTFSOBJINFO ObjInfo;
-        RT_ZERO(ObjInfo);
-        vrc = RTPathQueryInfoEx(strDstRootAbs.c_str(), &ObjInfo, RTFSOBJATTRADD_NOTHING,
-                                fFollowSymlinks ? RTPATH_F_FOLLOW_LINK : RTPATH_F_ON_LINK /* fFlags */);
-        if (RT_FAILURE(vrc))
+        RTFSOBJINFO dstFsObjInfo;
+        RT_ZERO(dstFsObjInfo);
+        vrc = RTPathQueryInfoEx(strDstRootAbs.c_str(), &dstFsObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK /* fFlags */);
+        if (RT_SUCCESS(vrc))
+        {
+            char szPathReal[RTPATH_MAX];
+            vrc = RTPathReal(strDstRootAbs.c_str(), szPathReal, sizeof(szPathReal));
+            if (RT_SUCCESS(vrc))
+            {
+                vrc = RTPathQueryInfoEx(szPathReal, &dstFsObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK /* fFlags */);
+                if (RT_SUCCESS(vrc))
+                {
+                    LogRel2(("Guest Control: Host destination is a symbolic link '%s' -> '%s' (%s)\n",
+                             strDstRootAbs.c_str(), szPathReal,
+                             GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(dstFsObjInfo.Attr.fMode))));
+                }
+
+                strDstRootAbs = szPathReal;
+            }
+        }
+        else
         {
             if (   vrc == VERR_FILE_NOT_FOUND
@@ -1698 +1714 @@
             LogFlowFunc(("Directory: fDirCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool -> fDstExist=%RTbool (%s)\n",
                          pList->mSourceSpec.fDirCopyFlags, fCopyIntoExisting, fFollowSymlinks,
-                         fDstExists, GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(ObjInfo.Attr.fMode))));
+                         fDstExists, GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(dstFsObjInfo.Attr.fMode))));
 
             if (fDstExists)
             {
-                switch (ObjInfo.Attr.fMode & RTFS_TYPE_MASK)
+                switch (dstFsObjInfo.Attr.fMode & RTFS_TYPE_MASK)
                 {
                     case RTFS_TYPE_DIRECTORY:
@@ -1728 +1744 @@
                         setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                             Utf8StrFmt(tr("Unknown object type (%#x) on host for \"%s\""),
-                                                       ObjInfo.Attr.fMode & RTFS_TYPE_MASK, strDstRootAbs.c_str()));
+                                                       dstFsObjInfo.Attr.fMode & RTFS_TYPE_MASK, strDstRootAbs.c_str()));
                         vrc = VERR_NOT_SUPPORTED;
                         break;
@@ -1816 +1832 @@
             LogFlowFunc(("File: fFileCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool -> fDstExist=%RTbool (%s)\n",
                          pList->mSourceSpec.fFileCopyFlags, fCopyIntoExisting, fFollowSymlinks,
-                         fDstExists, GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(ObjInfo.Attr.fMode))));
+                         fDstExists, GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(dstFsObjInfo.Attr.fMode))));
 
             if (fDstExists)
             {
-                switch (ObjInfo.Attr.fMode & RTFS_TYPE_MASK)
+                switch (dstFsObjInfo.Attr.fMode & RTFS_TYPE_MASK)
                 {
                     case RTFS_TYPE_DIRECTORY:
@@ -1847 +1863 @@
                         setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                             Utf8StrFmt(tr("Unknown object type (%#x) on host for \"%s\""),
-                                                       ObjInfo.Attr.fMode & RTFS_TYPE_MASK, strDstRootAbs.c_str()));
+                                                       dstFsObjInfo.Attr.fMode & RTFS_TYPE_MASK, strDstRootAbs.c_str()));
                         vrc = VERR_NOT_SUPPORTED;
                         break;
@@ -2018 +2034 @@
                         if (RT_SUCCESS(vrc))
                         {
-                            LogRel2(("Guest Control: Host source symbolic link '%s' -> '%s' (%s)\n",
+                            LogRel2(("Guest Control: Host source is a symbolic link '%s' -> '%s' (%s)\n",
                                      strSrc.c_str(), szPathReal,
                                      GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(srcFsObjInfo.Attr.fMode))));