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

Timestamp:

Nov 9, 2022 8:20:10 AM (3 years ago)

Author:

vboxsync

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

154484

Message:

Guest Control/Main: More fixes for single file copying into existing directories. bugref:10286

File:

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

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

@@ -1670 +1670 @@
         if (pList->mSourceSpec.enmType == FsObjType_Directory)
         {
-            LogFlowFunc(("Directory: fDirCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool\n",
-                         pList->mSourceSpec.fDirCopyFlags, fCopyIntoExisting, fFollowSymlinks));
+            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))));
 
             if (fDstExists)
@@ -1798 +1799 @@
         else if (pList->mSourceSpec.enmType == FsObjType_File)
         {
-            LogFlowFunc(("File: fFileCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool\n",
-                         pList->mSourceSpec.fFileCopyFlags, fCopyIntoExisting, fFollowSymlinks));
+            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))));
 
             if (fDstExists)
@@ -1807 +1809 @@
                     case RTFS_TYPE_DIRECTORY:
                     {
-                        if (!fCopyIntoExisting)
-                        {
-                            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                Utf8StrFmt(tr("Destination \"%s\" on the host already exists and is a directory"),
-                                                           strDstRootAbs.c_str()));
-                            vrc = VERR_IS_A_DIRECTORY;
-                            break;
-                        }
-
-                        /* Append the actual file name to the destination. */
-                        strDstRootAbs += PATH_STYLE_SEP_STR(PATH_STYLE_NATIVE);
-                        strDstRootAbs += RTPathFilename(strSrcRootAbs.c_str());
+                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                            Utf8StrFmt(tr("Destination \"%s\" on the host already exists and is a directory"),
+                                                       strDstRootAbs.c_str()));
+                        vrc = VERR_IS_A_DIRECTORY;
                         break;
                     }
@@ -2142 +2136 @@
         if (pList->mSourceSpec.enmType == FsObjType_Directory)
         {
-            LogFlowFunc(("Directory: fDirCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool\n",
-                         pList->mSourceSpec.fDirCopyFlags, fCopyIntoExisting, fFollowSymlinks));
+            LogFlowFunc(("Directory: fDirCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool -> fDstExist=%RTbool (%s)\n",
+                         pList->mSourceSpec.fDirCopyFlags, fCopyIntoExisting, fFollowSymlinks,
+                         fDstExists, GuestBase::fsObjTypeToStr(dstObjData.mType)));
 
             if (fDstExists)
@@ -2277 +2272 @@
         else if (pList->mSourceSpec.enmType == FsObjType_File)
         {
-            LogFlowFunc(("File: fFileCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool\n",
-                         pList->mSourceSpec.fFileCopyFlags, fCopyIntoExisting, fFollowSymlinks));
+            LogFlowFunc(("File: fFileCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool -> fDstExist=%RTbool (%s)\n",
+                         pList->mSourceSpec.fFileCopyFlags, fCopyIntoExisting, fFollowSymlinks,
+                         fDstExists, GuestBase::fsObjTypeToStr(dstObjData.mType)));
 
             if (fDstExists)
@@ -2286 +2282 @@
                     case FsObjType_Directory:
                     {
-                        if (!fCopyIntoExisting)
-                        {
-                            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                Utf8StrFmt(tr("Destination \"%s\" on the guest already exists and is a directory"),
-                                                           strDstRootAbs.c_str()));
-                            vrc = VERR_IS_A_DIRECTORY;
-                            break;
-                        }
-
-                        /* Append the actual file name to the destination. */
-                        strDstRootAbs += PATH_STYLE_SEP_STR(mSession->i_getGuestPathStyle());
-                        strDstRootAbs += RTPathFilename(strSrcRootAbs.c_str());
+                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                            Utf8StrFmt(tr("Destination \"%s\" on the guest already exists and is a directory"),
+                                                       strDstRootAbs.c_str()));
+                        vrc = VERR_IS_A_DIRECTORY;
                         break;
                     }