Changeset 97417 in vbox

Timestamp:

Nov 6, 2022 10:31:19 AM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: More path building / translation fixes. ​bugref:10286

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (1 diff)
• src-client/GuestSessionImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -1388 +1388 @@
 };
 
+/** Returns the path separator based on \a a_enmPathStyle as a C-string. */
+#define PATH_STYLE_SEP_STR(a_enmPathStyle) a_enmPathStyle == PathStyle_DOS ? "\\" : "/"
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+# define PATH_STYLE_NATIVE               PathStyle_DOS
+#else
+# define PATH_STYLE_NATIVE               PathStyle_UNIX
+#endif
+
 /**
  * Class for handling guest / host path functions.

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

@@ -1750 +1750 @@
     else if (pszSrcName && !pszDstName) /* #2 */
     {
-        strDstPath += RTPATH_SLASH_STR;
+        if (!strDstPath.endsWith(PATH_STYLE_SEP_STR(enmDstPathStyle)))
+            strDstPath += PATH_STYLE_SEP_STR(enmDstPathStyle);
         strDstPath += pszSrcName;
     }

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

@@ -74 +74 @@
 #define ISOFILE_FLAG_OPTIONAL            RT_BIT(8)
 
-
-/** Returns the path separator based on \a a_enmPathStyle as a C-string. */
-#define PATH_STYLE_SEP_STR(a_enmPathStyle) a_enmPathStyle == PathStyle_DOS ? "\\" : "/"
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-# define PATH_STYLE_NATIVE               PathStyle_DOS
-#else
-# define PATH_STYLE_NATIVE               PathStyle_UNIX
-#endif
 
 // session task classes
@@ -2051 +2043 @@
         Utf8Str strDstRootAbs = pList->mDstRootAbs;
 
-        GuestPath::BuildDestinationPath(strSrcRootAbs, PATH_STYLE_NATIVE,
-                                        strDstRootAbs, mSession->i_getGuestPathStyle());
-
-        /* Translate the destination path from the host to a path compatible with the guest.
-         * strDstRootAbs already is in the destination path style, so just do a path cleanup. */
+        /* 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 */);
+
+        GuestPath::BuildDestinationPath(strSrcRootAbs, PATH_STYLE_NATIVE,
+                                        strDstRootAbs, mSession->i_getGuestPathStyle());
+
+
         if (RT_FAILURE(vrc))
         {