Changeset 97426 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

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

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlPrivate.cpp (modified) (3 diffs)
• GuestSessionImplTasks.cpp (modified) (7 diffs)

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

@@ -1794 +1794 @@
         RTPathChangeToUnixSlashes(strTranslated.mutableRaw(), true /* fForce */);
     }
-    else if (enmDstPathStyle == PathStyle_DOS)
-    {
-        if (   enmSrcPathStyle == PathStyle_DOS
-            && fForce)
-        {
-            strTranslated = strPath;
-            RTPathChangeToDosSlashes(strTranslated.mutableRaw(), true /* fForce */);
-        }
-        else if (enmSrcPathStyle == PathStyle_UNIX)
-        {
-            /** @todo Check for quoted (sub) strings, e.g. '/foo/bar/\ baz' vs . '/foo/bar/"\ baz"'? */
-            const char  *psz = strPath.c_str();
-            size_t const cch = strPath.length();
-            size_t       off = 0;
-            while (off < cch)
-            {
-                /* Most likely cases first. */
-                if (psz[off] == '/') /* Just transform slashes. */
-                    strTranslated += '\\';
-                /*
-                 * Do a mapping of "\", which marks an escape sequence for paths on UNIX-y OSes to DOS-based OSes (like Windows),
-                 * however, on DOS "\" is a path separator.
-                 *
-                 * See @ticketref{21095}.
-                 */
-                /** @todo r=bird: Seeing that callers like GuestSessionTaskCopyFrom::Run() has
-                 * passed strPath to RTPathQueryInfoEx() prior to calling this function, I don't
-                 * get the comments about escape sequence stuff here.
-                 *
-                 * "\" ("\\" in C/C++) is not an escape sequence on unix unless you're in a
-                 * typical unix shell like bash.  It's just a filename character that doesn't
-                 * get interpreted as anything special by the kernel (unlike '/' and '\0' (C/C++
-                 * encoding)).
-                 *
-                 * "\ " (or "\\ " in C/C++) does not mark a single space in a path component, it
-                 * signifies two characters, a backslash and a space, neither with any special
-                 * meaning to a UNIX host.
-                 */
-                else if (psz[off] == '\\')
-                {
-                    /* "\ " is valid on UNIX-system and mark a space in a path component. */
-                    if (   off + 1      <= cch
-                        && psz[off + 1] == ' ')
-                    {
-                        strTranslated += ' ';
-                        off++; /* Skip actual escape sequence char (space in this case). */
-                    }
-                    else
-                    {
-                        /* Every other escape sequence is not supported and would lead to different paths anyway, so bail out here. */
-                        vrc = VERR_NOT_SUPPORTED;
-                        break;
-                    }
-                }
-                else /* Just add it unmodified. */
-                    strTranslated += psz[off];
-                off++;
-            }
-        }
+    else if (  (   enmSrcPathStyle == PathStyle_UNIX
+                && enmDstPathStyle == PathStyle_DOS)
+            || (fForce && enmDstPathStyle == PathStyle_DOS))
+
+    {
+        strTranslated = strPath;
+        RTPathChangeToDosSlashes(strTranslated.mutableRaw(), true /* fForce */);
     }
 
@@ -1877 +1825 @@
         if (off + 1 > cch)
             break;
-        /* Remove double slashes. */
-        if (   psz[off]     == '\\'
+        /* Remove double back slashes (DOS only). */
+        if (   enmDstPathStyle == PathStyle_DOS
+            && psz[off]     == '\\'
             && psz[off + 1] == '\\')
         {
@@ -1884 +1833 @@
             off++;
         }
-        if (   psz[off]     == '/'
+        /* Remove double forward slashes (UNIX only). */
+        if (   enmDstPathStyle == PathStyle_UNIX
+            && psz[off]     == '/'
             && psz[off + 1] == '/')
         {

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))
             {