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

Timestamp:

Nov 8, 2022 10:09:13 AM (3 years ago)

Author:

vboxsync

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

154453

Message:

Guest Control/Main: More fixes wrt respecting the FileCopyFlag_ flags. bugref:10286

File:

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

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

@@ -496 +496 @@
  * Copies a file from the guest to the host.
  *
+ * @return VBox status code.
+ * @retval VWRN_ALREADY_EXISTS  if the file already exists and FileCopyFlag_NoReplace is specified,
+ *                              *or * the file at the destination has the same (or newer) modification time
+ *                              and FileCopyFlag_Update is specified.
  * @param  strSrc               Full path of source file on the guest to copy.
  * @param  strDst               Full destination path and file name (host style) to copy file to.
@@ -579 +583 @@
             if (fFileCopyFlags & FileCopyFlag_NoReplace)
             {
-                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Host file \"%s\" already exists"), strDst.c_str()));
-                vrc = VERR_ALREADY_EXISTS;
-            }
-
-            if (fFileCopyFlags & FileCopyFlag_Update)
+                LogRel2(("Guest Control: Host file \"%s\" already exists, skipping", strDst.c_str()));
+                vrc = VWRN_ALREADY_EXISTS;
+                fSkip = true;
+            }
+
+            if (   !fSkip
+                && fFileCopyFlags & FileCopyFlag_Update)
             {
                 RTTIMESPEC srcModificationTimeTS;
@@ -591 +596 @@
                 {
                     LogRel2(("Guest Control: Host file \"%s\" has same or newer modification date, skipping", strDst.c_str()));
+                    vrc = VWRN_ALREADY_EXISTS;
                     fSkip = true;
                 }
@@ -601 +607 @@
             else if (vrc != VERR_FILE_NOT_FOUND)  /* Ditto. */
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Host destination file lookup for \"%s\" failed: %Rrc"), strDst.c_str(), vrc));
+                                    Utf8StrFmt(tr("Host file lookup for \"%s\" failed: %Rrc"), strDst.c_str(), vrc));
         }
     }
@@ -609 +615 @@
         int vrc2 = srcFile->i_closeFile(&vrcGuest);
         AssertRC(vrc2);
-        return VINF_SUCCESS;
+        return vrc;
     }
 
@@ -642 +648 @@
     }
 
-    LogRel2(("Guest Control: Copying file '%s' from guest to '%s' on host ...\n", strSrc.c_str(), strDst.c_str()));
-
     LogFlowFunc(("vrc=%Rrc, dstFsType=%#x, pszDstFile=%s\n", vrc, dstObjInfo.Attr.fMode & RTFS_TYPE_MASK, strDst.c_str()));
 
@@ -649 +653 @@
         || vrc == VERR_FILE_NOT_FOUND)
     {
+        LogRel2(("Guest Control: Copying file '%s' from guest to '%s' on host ...\n", strSrc.c_str(), strDst.c_str()));
 
         RTFILE hDstFile;
@@ -788 +793 @@
  * Copies a file from the host to the guest.
  *
+ * @return VBox status code.
+ * @retval VWRN_ALREADY_EXISTS  if the file already exists and FileCopyFlag_NoReplace is specified,
+ *                              *or * the file at the destination has the same (or newer) modification time
+ *                              and FileCopyFlag_Update is specified.
  * @param  strSrc               Full path of source file on the host.
  * @param  strDst               Full destination path and file name (guest style) to copy file to. Guest-path style.
@@ -794 +803 @@
 int GuestSessionTask::fileCopyToGuest(const Utf8Str &strSrc, const Utf8Str &strDst, FileCopyFlag_T fFileCopyFlags)
 {
-    LogFlowThisFunc(("strSource=%s, strDst=%s, fFileCopyFlags=0x%x\n", strSrc.c_str(), strDst.c_str(), fFileCopyFlags));
+    LogFlowThisFunc(("strSource=%s, strDst=%s, fFileCopyFlags=%#x\n", strSrc.c_str(), strDst.c_str(), fFileCopyFlags));
 
     GuestFileOpenInfo dstOpenInfo;
@@ -840 +849 @@
             if (RT_SUCCESS(vrc))
             {
-                if (fFileCopyFlags & FileCopyFlag_Update)
+                /* Only perform a remote file query when needed.  */
+                if (   (fFileCopyFlags & FileCopyFlag_Update)
+                    || (fFileCopyFlags & FileCopyFlag_NoReplace))
                 {
                     GuestFsObjData dstObjData;
@@ -847 +858 @@
                     if (RT_SUCCESS(vrc))
                     {
-                        RTTIMESPEC dstModificationTimeTS;
-                        RTTimeSpecSetSeconds(&dstModificationTimeTS, dstObjData.mModificationTime);
-                        if (RTTimeSpecCompare(&dstModificationTimeTS, &srcObjInfo.ModificationTime) <= 0)
+                        if (fFileCopyFlags & FileCopyFlag_NoReplace)
                         {
-                            LogRel2(("Guest Control: Guest file \"%s\" has same or newer modification date, skipping",
-                                     strDst.c_str()));
+                            LogRel2(("Guest Control: Guest file \"%s\" already exists, skipping", strDst.c_str()));
+                            vrc = VWRN_ALREADY_EXISTS;
                             fSkip = true;
+                        }
+
+                        if (   !fSkip
+                            && fFileCopyFlags & FileCopyFlag_Update)
+                        {
+                            RTTIMESPEC dstModificationTimeTS;
+                            RTTimeSpecSetSeconds(&dstModificationTimeTS, dstObjData.mModificationTime);
+                            if (RTTimeSpecCompare(&dstModificationTimeTS, &srcObjInfo.ModificationTime) <= 0)
+                            {
+                                LogRel2(("Guest Control: Guest file \"%s\" has same or newer modification date, skipping",
+                                         strDst.c_str()));
+                                vrc = VWRN_ALREADY_EXISTS;
+                                fSkip = true;
+                            }
                         }
                     }
@@ -893 +916 @@
         int vrc2 = dstFile->i_closeFile(&vrcGuest);
         AssertRC(vrc2);
-        return VINF_SUCCESS;
+        return vrc;
     }
 
@@ -1792 +1815 @@
                             break;
                         }
+
+                        /* Append the actual file name to the destination. */
+                        strDstRootAbs += PATH_STYLE_SEP_STR(PATH_STYLE_NATIVE);
+                        strDstRootAbs += RTPathFilename(strSrcRootAbs.c_str());
                         break;
                     }