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

Timestamp:

Nov 4, 2022 1:35:06 PM (3 years ago)

Author:

vboxsync

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

154399

Message:

Guest Control/Main: Rewrite of the path building and directory walking code for the copyFrom / copyTo guest session tasks, to (hopefully) have a cleaner structure. The new path building now also takes into account whether a destination has a trailing delimiter and then act accordingly (see rules in GuestPath::BuildDestinationPath()). Adjusted VBoxManage and FE/Qt to also reflect that; should now work as common tools like cp. Added new test cases and also re-enabled old ones which were disabled since quite a while (should pass now) [translation fixes, logging adjustments]. ​bugref:10286

File:

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

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

@@ -1702 +1702 @@
             {
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Translating host destination root path '%s' failed: %Rrc"),
+                                    Utf8StrFmt(tr("Translating host destination root path \"%s\" failed: %Rrc"),
                                                strDstRootAbs.c_str(), vrc));
                 break;
@@ -1739 +1739 @@
                 {
                     setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(tr("Translating guest source path '%s' from %s to %s failed: %Rrc"),
-                                                   strSrcAbs.c_str(),
-                                                   GuestBase::pathStyleToStr(pList->mSourceSpec.enmPathStyle),
-                                                   GuestBase::pathStyleToStr(pList->mSourceSpec.enmPathStyle), vrc));
+                                        Utf8StrFmt(tr("Translating guest source path \"%s\" failed: %Rrc"),
+                                                   strSrcAbs.c_str(), vrc));
                     break;
                 }
 
                 /* Translate the final host destination path. */
-                vrc = GuestPath::Translate(strDstAbs, pList->mSourceSpec.enmPathStyle, PATH_STYLE_NATIVE /* Source */, true /* fForce */);
+                vrc = GuestPath::Translate(strDstAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */, true /* fForce */);
                 if (RT_FAILURE(vrc))
                 {
                     setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(tr("Translating host destination path '%s' from %s to %s failed: %Rrc"),
-                                                   strDstAbs.c_str(),
-                                                   GuestBase::pathStyleToStr(pList->mSourceSpec.enmPathStyle),
-                                                   GuestBase::pathStyleToStr(PATH_STYLE_NATIVE), vrc));
+                                        Utf8StrFmt(tr("Translating host destination path \"%s\" failed: %Rrc"),
+                                                   strDstAbs.c_str(), vrc));
                     break;
                 }
@@ -2066 +2062 @@
         {
             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                Utf8StrFmt(tr("Translating guest destination path '%s' from %s to %s failed: %Rrc"),
-                                           strDstRootAbs.c_str(),
-                                           GuestBase::pathStyleToStr(PATH_STYLE_NATIVE),
-                                           GuestBase::pathStyleToStr(mSession->i_getGuestPathStyle()), vrc));
+                                Utf8StrFmt(tr("Translating guest destination path \"%s\" failed: %Rrc"),
+                                           strDstRootAbs.c_str(), vrc));
             break;
         }
@@ -2178 +2172 @@
             {
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Translating guest destination root path '%s' failed: %Rrc"),
+                                    Utf8StrFmt(tr("Translating guest destination root path \"%s\" failed: %Rrc"),
                                                strDstRootAbs.c_str(), vrc));
                 break;
@@ -2216 +2210 @@
                 {
                     setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(tr("Translating host source path '%s' from %s to %s failed: %Rrc"),
-                                                   strSrcAbs.c_str(),
-                                                   GuestBase::pathStyleToStr(PATH_STYLE_NATIVE),
-                                                   GuestBase::pathStyleToStr(PATH_STYLE_NATIVE), vrc));
+                                        Utf8StrFmt(tr("Translating host source path\"%s\" failed: %Rrc"),
+                                                   strSrcAbs.c_str(), vrc));
                     break;
                 }
@@ -2230 +2222 @@
                 {
                     setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(tr("Translating guest destination path '%s' from %s to %s failed: %Rrc"),
-                                                   strDstAbs.c_str(),
-                                                   GuestBase::pathStyleToStr(PATH_STYLE_NATIVE),
-                                                   GuestBase::pathStyleToStr(mSession->i_getGuestPathStyle()), vrc));
+                                        Utf8StrFmt(tr("Translating guest destination path \"%s\" failed: %Rrc"),
+                                                   strDstAbs.c_str(), vrc));
                     break;
                 }
@@ -2323 +2313 @@
             {
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Translating guest destination path '%s' from %s to %s failed: %Rrc"),
+                                    Utf8StrFmt(tr("Translating guest destination path \"%s\" failed: %Rrc"),
                                                strDstRootAbs.c_str(), vrc));
                 break;