Changeset 84864 in vbox

Timestamp:

Jun 17, 2020 2:10:06 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Various fixes for copyFromGuest tasks. bugref:9320

File:

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

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

@@ -381 +381 @@
     }
 
-    BYTE byBuf[_64K];
+    BYTE byBuf[_64K]; /** @todo Can we do better here? */
     while (cbToRead)
     {
@@ -404 +404 @@
         }
 
-        Assert(cbToRead >= cbRead);
+        AssertBreak(cbToRead >= cbRead);
         cbToRead -= cbRead;
 
         /* Update total bytes written to the guest. */
         cbWrittenTotal += cbRead;
-        Assert(cbWrittenTotal <= cbSize);
+        AssertBreak(cbWrittenTotal <= cbSize);
 
         /* Did the user cancel the operation above? */
@@ -465 +465 @@
 int GuestSessionTask::fileCopyFromGuest(const Utf8Str &strSrc, const Utf8Str &strDst, FileCopyFlag_T fFileCopyFlags)
 {
-    LogFlowThisFunc(("strSource=%s, strDest=%s, enmFileCopyFlags=0x%x\n", strSrc.c_str(), strDst.c_str(), fFileCopyFlags));
+    LogFlowThisFunc(("strSource=%s, strDest=%s, enmFileCopyFlags=%#x\n", strSrc.c_str(), strDst.c_str(), fFileCopyFlags));
 
     GuestFileOpenInfo srcOpenInfo;
@@ -506 +506 @@
             default:
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(GuestSession::tr("Guest object \"%s\" is not a file"), strSrc.c_str()));
+                                    Utf8StrFmt(GuestSession::tr("Guest object \"%s\" is not a file (is type %#x)"),
+                                               strSrc.c_str(), srcObjData.mType));
                 rc = VERR_NOT_A_FILE;
                 break;
@@ -529 +530 @@
         return rc;
 
-    char *pszDstFile = NULL;
     RTFSOBJINFO dstObjInfo;
     RT_ZERO(dstObjInfo);
@@ -553 +553 @@
                 if (RTTimeSpecCompare(&srcModificationTimeTS, &dstObjInfo.ModificationTime) <= 0)
                 {
-                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(GuestSession::tr("Host file \"%s\" has same or newer modification date"),
-                                                   strDst.c_str()));
+                    LogRel2(("Guest Control: Host file \"%s\" has same or newer modification date, skipping", strDst.c_str()));
                     fSkip = true;
                 }
@@ -576 +574 @@
     }
 
+    char *pszDstFile = NULL;
+
     if (RT_SUCCESS(rc))
     {
@@ -593 +593 @@
             /* Build the final file name with destination path (on the host). */
             char szDstPath[RTPATH_MAX];
-            RTStrPrintf2(szDstPath, sizeof(szDstPath), "%s", strDst.c_str());
-
-            if (   !strDst.endsWith("\\")
-                && !strDst.endsWith("/"))
-                RTPathAppend(szDstPath, sizeof(szDstPath), "/"); /* IPRT can handle / on all hosts. */
-
-            RTPathAppend(szDstPath, sizeof(szDstPath), RTPathFilenameEx(strSrc.c_str(), mfPathStyle));
-
-            pszDstFile = RTStrDup(szDstPath);
+            rc = RTStrCopy(szDstPath, sizeof(szDstPath), strDst.c_str());
+            if (RT_SUCCESS(rc))
+            {
+                rc = RTPathAppend(szDstPath, sizeof(szDstPath), RTPathFilenameEx(strSrc.c_str(), mfPathStyle));
+                if (RT_SUCCESS(rc))
+                    pszDstFile = RTStrDup(szDstPath);
+            }
         }
         else if (RTFS_IS_SYMLINK(dstObjInfo.Attr.fMode))
@@ -629 +627 @@
         if (!pszDstFile)
         {
-            setProgressErrorMsg(VBOX_E_IPRT_ERROR, Utf8StrFmt(GuestSession::tr("No memory to allocate destination file path")));
+            setProgressErrorMsg(VBOX_E_IPRT_ERROR, Utf8StrFmt(GuestSession::tr("No memory to allocate host file path")));
             rc = VERR_NO_MEMORY;
         }
@@ -1408 +1406 @@
     if (mDest.isEmpty())
     {
-        strErrorInfo = Utf8StrFmt(GuestSession::tr("Destination must not be empty"));
+        strErrorInfo = Utf8StrFmt(GuestSession::tr("Host destination must not be empty"));
         vrc = VERR_INVALID_PARAMETER;
     }
@@ -1423 +1421 @@
             if (strSrc.isEmpty())
             {
-                strErrorInfo = Utf8StrFmt(GuestSession::tr("Source entry must not be empty"));
+                strErrorInfo = Utf8StrFmt(GuestSession::tr("Guest source entry must not be empty"));
                 vrc = VERR_INVALID_PARAMETER;
                 break;
@@ -1456 +1454 @@
             if (RT_FAILURE(vrc))
             {
-                strErrorInfo = Utf8StrFmt(GuestSession::tr("No such source file/directory: %s"), strSrc.c_str());
+                if (vrc == VERR_GSTCTL_GUEST_ERROR)
+                    strErrorInfo = GuestBase::getErrorAsString(GuestSession::tr("Guest file lookup failed"),
+                                                               GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, strSrc.c_str()));
+                else
+                    strErrorInfo = Utf8StrFmt(GuestSession::tr("Guest file lookup for \"%s\" failed: %Rrc"),
+                                              strSrc.c_str(), vrc);
                 break;
             }
@@ -1464 +1467 @@
                 if (itSrc->enmType != FsObjType_Directory)
                 {
-                    strErrorInfo = Utf8StrFmt(GuestSession::tr("Source is not a file: %s"), strSrc.c_str());
+                    strErrorInfo = Utf8StrFmt(GuestSession::tr("Guest source is not a file: %s"), strSrc.c_str());
                     vrc = VERR_NOT_A_FILE;
                     break;
@@ -1473 +1476 @@
                 if (itSrc->enmType != FsObjType_File)
                 {
-                    strErrorInfo = Utf8StrFmt(GuestSession::tr("Source is not a directory: %s"), strSrc.c_str());
+                    strErrorInfo = Utf8StrFmt(GuestSession::tr("Guest source is not a directory: %s"), strSrc.c_str());
                     vrc = VERR_NOT_A_DIRECTORY;
                     break;
@@ -1495 +1498 @@
                 {
                     delete pFsList;
-                    strErrorInfo = Utf8StrFmt(GuestSession::tr("Error adding source '%s' to list: %Rrc"), strSrc.c_str(), vrc);
+                    strErrorInfo = Utf8StrFmt(GuestSession::tr("Error adding guest source '%s' to list: %Rrc"),
+                                              strSrc.c_str(), vrc);
                     break;
                 }