feat(path): expand ~\ prefix on MS-Windows

In fix_fname() for MS-Windows, expand "~\" or "~/" prefixed paths to the USERPROFILE environment variable for the user's profile directory instead of a relative path to a literal "~" directory. Fix #23901 Signed-off-by: Rafael Kitover <[email protected]>
neovim · May 20, 2024 · ac8a4d6 · ac8a4d6
1 parent 91892f5
commit ac8a4d6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
@@ -68,6 +68,9 @@ TUI
 
 • TODO
 
+* On MS-Windows, paths prefixed with "~/" or "~\" are now expanded to the
+ user's profile directory, not a relative path to a literal "~" directory.
+
 ==============================================================================
 NEW FEATURES *news-features*
 

diff --git a/src/nvim/path.c b/src/nvim/path.c
@@ -1884,7 +1884,8 @@ int vim_FullName(const char *fname, char *buf, size_t len, bool force)
 /// the root may have relative paths (like dir/../subdir) or symlinks
 /// embedded, or even extra separators (//). This function addresses
 /// those possibilities, returning a resolved absolute path.
-/// For MS-Windows, this also expands names like "longna~1".
+/// For MS-Windows, this also expands names like "longna~1" and
+/// replaces "~/" or "~\" prefixes with the user profile directory.
 ///
 /// @param fname is the filename to expand
 /// @return [allocated] Full path (NULL for failure).
@@ -1893,18 +1894,24 @@ char *fix_fname(const char *fname)
 #ifdef UNIX
  return FullName_save(fname, true);
 #else
- if (!vim_isAbsName(fname)
- || strstr(fname, "..") != NULL
- || strstr(fname, "//") != NULL
+ if (*fname == '~' && (fname[1] == '/' || fname[1] == '\\')) {
+ const char *profile_dir = os_getenv("USERPROFILE");
+ size_t len = strlen(profile_dir) + strlen(fname);
+ char *new_fname = xmalloc(len);
+ snprintf(new_fname, len, "%s%s", profile_dir, fname + 1);
+ fname = new_fname;
+ } else if (!vim_isAbsName(fname)
+ || strstr(fname, "..") != NULL
+ || strstr(fname, "//") != NULL
 # ifdef BACKSLASH_IN_FILENAME
- || strstr(fname, "\\\\") != NULL
+  || strstr(fname, "\\\\") != NULL
 # endif
- ) {
+  ) {
  return FullName_save(fname, false);
+ } else {
+ fname = xstrdup(fname);
  }
 
- fname = xstrdup(fname);
-
 # ifdef USE_FNAME_CASE
  path_fix_case((char *)fname); // set correct case for file name
 # endif