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

Timestamp:

Nov 7, 2022 7:44:16 AM (3 years ago)

Author:

vboxsync

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

154431

Message:

Guest Control/Main: Resolved a @todo: Removed the escaping stuff from GuestPath::Translate() and only remove (clean up) double slashes according to the destination's path style. Also, don't force any path conversions when source path style == dest path style, as this would lose (i.e. forcefully get converted) stuff which actually would be valid ('\' in UNIX paths, for instance). ​bugref:10286

File:

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

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

@@ -1726 +1726 @@
 
                 /* Clean up the final guest source path (for cleaning up mixed path separators). */
-                vrc = GuestPath::Translate(strSrcAbs, pList->mSourceSpec.enmPathStyle /* Source */, pList->mSourceSpec.enmPathStyle /* Dest */,
-                                           true /* fForce */);
+                vrc = GuestPath::Translate(strSrcAbs, pList->mSourceSpec.enmPathStyle /* Source */,
+                                           pList->mSourceSpec.enmPathStyle /* Dest */);
                 if (RT_FAILURE(vrc))
                 {
@@ -1737 +1737 @@
 
                 /* Translate the final host destination path. */
-                vrc = GuestPath::Translate(strDstAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */, true /* fForce */);
+                vrc = GuestPath::Translate(strDstAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */);
                 if (RT_FAILURE(vrc))
                 {
@@ -2045 +2045 @@
         /* Translate the destination path to a path compatible with the guest.
          * Note: This needs to be done *before* GuestPath::BuildDestinationPath() below! */
-        vrc = GuestPath::Translate(strDstRootAbs,
-                                   mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */,
-                                   true /* fForce */);
+        vrc = GuestPath::Translate(strDstRootAbs, mSession->i_getGuestPathStyle() /* Source */,
+                                   mSession->i_getGuestPathStyle() /* Dest */);
 
         GuestPath::BuildDestinationPath(strSrcRootAbs, PATH_STYLE_NATIVE,
@@ -2161 +2160 @@
             /* Clean up the final guest destination root path (for cleaning up mixed path separators). */
             vrc = GuestPath::Translate(strDstRootAbs,
-                                       mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */,
-                                       true /* fForce */);
+                                       mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */);
             if (RT_FAILURE(vrc))
             {
@@ -2198 +2196 @@
 
                 /* Clean up the final host source path (for cleaning up mixed path separators). */
-                vrc = GuestPath::Translate(strSrcAbs,
-                                           PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */,
-                                           true /* fForce */);
+                vrc = GuestPath::Translate(strSrcAbs, PATH_STYLE_NATIVE /* Source */, PATH_STYLE_NATIVE /* Dest */);
                 if (RT_FAILURE(vrc))
                 {
@@ -2211 +2207 @@
                 /* Translate the final guest destination path. */
                 vrc = GuestPath::Translate(strDstAbs,
-                                           mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */,
-                                           true /* fForce */);
+                                           mSession->i_getGuestPathStyle() /* Source */, mSession->i_getGuestPathStyle() /* Dest */);
                 if (RT_FAILURE(vrc))
                 {
@@ -2302 +2297 @@
 
             /* Cleanup the destination path. */
-            vrc = GuestPath::Translate(strDstRootAbs, mSession->i_getGuestPathStyle() /* Source */,
-                                       mSession->i_getGuestPathStyle() /* Dest */, true /* fForce */);
+            vrc = GuestPath::Translate(strDstRootAbs,
+                                       mSession->i_getGuestPathStyle() /* Source */,  mSession->i_getGuestPathStyle() /* Dest */);
             if (RT_FAILURE(vrc))
             {