Changeset 97304 in vbox for trunk/src

Timestamp:

Oct 26, 2022 2:28:53 PM (3 years ago)

Author:

vboxsync

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

154295

Message:

Main/Guest Control: Added a force parameter to GuestPath::Translate() and made a little more flexible wrt same-same conversions. Adjusted testcase. ​bugref:10286

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -1405 +1405 @@
     /** @name Static helper functions.
      * @{ */
-    static int Translate(Utf8Str &strPath, PathStyle_T enmSrcPathStyle, PathStyle_T enmDstPathStyle);
+    static int Translate(Utf8Str &strPath, PathStyle_T enmSrcPathStyle, PathStyle_T enmDstPathStyle, bool fForce = false);
     /** @}  */
 };

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

@@ -1698 +1698 @@
  * @param   enmSrcPathStyle     Source path style \a strPath is expected in.
  * @param   enmDstPathStyle     Destination path style to convert to.
+ * @param   fForce              Whether to force the translation to the destination path style or not.
  *
  * @note    This does NOT remove any trailing slashes and/or perform file system lookups!
  */
 /* static */
-int GuestPath::Translate(Utf8Str &strPath, PathStyle_T enmSrcPathStyle, PathStyle_T enmDstPathStyle)
+int GuestPath::Translate(Utf8Str &strPath, PathStyle_T enmSrcPathStyle, PathStyle_T enmDstPathStyle, bool fForce /* = false */)
 {
     if (strPath.isEmpty())
@@ -1717 +1718 @@
     Utf8Str strTranslated;
 
-    if (   enmSrcPathStyle == PathStyle_DOS
-        && enmDstPathStyle == PathStyle_UNIX)
+    if (   (   enmSrcPathStyle == PathStyle_DOS
+            && enmDstPathStyle == PathStyle_UNIX)
+        || (fForce && enmDstPathStyle == PathStyle_UNIX))
     {
         strTranslated = RTPathChangeToUnixSlashes(strPath.mutableRaw(), true /* fForce */);
     }
-    else if (   enmSrcPathStyle == PathStyle_UNIX
-             && enmDstPathStyle == PathStyle_DOS)
-    {
-        /** @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 @bugref{21095}.
-             */
-            else if (psz[off] == '\\')
+    else if (enmDstPathStyle == PathStyle_DOS)
+    {
+        if (   enmSrcPathStyle == PathStyle_DOS
+            && fForce)
+        {
+            strTranslated = RTPathChangeToDosSlashes(strPath.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)
             {
-                /* "\ " is valid on UNIX-system and mark a space in a path component. */
-                if (   off + 1      <= cch
-                    && psz[off + 1] == ' ')
+                /* 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 @bugref{21095}.
+                 */
+                else if (psz[off] == '\\')
                 {
-                    strTranslated += ' ';
-                    off++; /* Skip actual escape sequence char (space in this case). */
+                    /* "\ " 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
-                {
-                    /* 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 /* Just add it unmodified. */
-                strTranslated += psz[off];
-            off++;
-        }
-    }
-    else if (enmSrcPathStyle == enmDstPathStyle)
+        }
+    }
+
+    if (   strTranslated.isEmpty() /* Not forced. */
+        && enmSrcPathStyle == enmDstPathStyle)
     {
         strTranslated = strPath;
     }
-    else
-        AssertFailedReturn(VERR_NOT_IMPLEMENTED);
 
     if (RT_FAILURE(vrc))

trunk/src/VBox/Main/testcase/tstGuestCtrlPaths.cpp

@@ -89 +89 @@
     tstPathTranslate("foo/bar/dir with space/",    PathStyle_UNIX, PathStyle_UNIX, VINF_SUCCESS, "foo/bar/dir with space/");
 
-    tstPathTranslate("foo/bar/dir_with_escape_sequence\\ space", PathStyle_UNIX, PathStyle_UNIX, VINF_SUCCESS, "foo/bar/dir_with_escape_sequence\\ space");
     /** 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 @bugref{21095} */
-    tstPathTranslate("foo/bar/dir_with_escape_sequence/the\\ space", PathStyle_UNIX,    PathStyle_DOS,  VINF_SUCCESS, "foo\\bar\\dir_with_escape_sequence\\the space");
-    tstPathTranslate("foo/bar/dir_with_escape_sequence/the\\ \\ space", PathStyle_UNIX, PathStyle_DOS,  VINF_SUCCESS, "foo\\bar\\dir_with_escape_sequence\\the  space");
+    tstPathTranslate("foo/bar/dir_with_escape_sequence\\ space", PathStyle_UNIX, PathStyle_UNIX, VINF_SUCCESS, "foo/bar/dir_with_escape_sequence\\ space");
+    tstPathTranslate("foo/bar/dir_with_escape_sequence\\ space", PathStyle_UNIX, PathStyle_DOS, VINF_SUCCESS, "foo\\bar\\dir_with_escape_sequence space");
+    tstPathTranslate("foo/bar/1_dir_with_escape_sequence/the\\ space", PathStyle_UNIX,    PathStyle_DOS,  VINF_SUCCESS, "foo\\bar\\1_dir_with_escape_sequence\\the space");
+    tstPathTranslate("foo/bar/2_dir_with_escape_sequence/the\\ \\ space", PathStyle_UNIX, PathStyle_DOS,  VINF_SUCCESS, "foo\\bar\\2_dir_with_escape_sequence\\the  space");
     tstPathTranslate("foo/bar/dir_with_escape_sequence/spaces at end\\  \\ ", PathStyle_UNIX, PathStyle_DOS,  VINF_SUCCESS, "foo\\bar\\dir_with_escape_sequence\\spaces at end   ");