Mercurial > octave

changeset 28192:450fe5371acd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 07 Apr 2020 18:24:51 +0200
parents 500937ff19d9 (current diff) 6ea1e96b69d4 (diff)
children 36a27ecbfc83
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/system/file-ops.cc	Mon Apr 06 17:31:37 2020 -0700
+++ b/liboctave/system/file-ops.cc	Tue Apr 07 18:24:51 2020 +0200
@@ -718,12 +718,12 @@
       if (retval.empty ())
         {
           // For UNC paths, take the input as is.
-          // Also translate forward slashes.
-          retval = name;
-          std::replace (retval.begin (), retval.end (), '/', '\\');
-          if (retval.compare (0, 2, "\\\\") == 0)
+          // Also translate forward slashes to backslashes.
+          std::string name_backsl = name;
+          std::replace (name_backsl.begin (), name_backsl.end (), '/', '\\');
+          if (name_backsl.compare (0, 2, "\\\\") == 0)
             {
-              w_tmp = u8_to_wstring (retval);
+              w_tmp = u8_to_wstring (name_backsl);
               strip_marker = false;
               wchar_t canon_path[MAX_PATH];
               if (PathCanonicalizeW (canon_path, w_tmp.c_str ()))