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. Signed-off-by: Rafael Kitover <[email protected]>
neovim · Apr 26, 2024 · a9121fa · a9121fa
1 parent 2c5fd3f
commit a9121fa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
@@ -146,6 +146,9 @@ unreleased features on Nvim HEAD.
 • Removed `vim.treesitter.foldtext` as transparent foldtext is now supported
  https://github.com/neovim/neovim/pull/20750
 
+* 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
@@ -1863,7 +1863,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).
@@ -1872,7 +1873,14 @@ char *fix_fname(const char *fname)
 #ifdef UNIX
  return FullName_save(fname, true);
 #else
- if (!vim_isAbsName(fname)
+ 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
@@ -1881,8 +1889,9 @@ char *fix_fname(const char *fname)
  ) {
  return FullName_save(fname, false);
  }
-
- fname = xstrdup(fname);
+ else {
+ fname = xstrdup(fname);
+ }
 
 # ifdef USE_FNAME_CASE
  path_fix_case((char *)fname); // set correct case for file name