neovim

commit fdeb01cd77404aba446c67af32134a2ff793a14b
parent bdb81afab3e5c43a33267666c2689feb284f6b52
Author: Rafael Kitover <rkitover@gmail.com>
Date:   Sat, 25 May 2024 12:44:39 +0000

feat(main): expand file ~\ or ~/ prefix on Windows (#28515)

In command_line_scan() for MSWIN, expand "~\" or "~/" prefixed paths to
the USERPROFILE environment variable for the user's profile directory.

Fix #23901

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
Diffstat:
M
runtime/doc/news.txt
 | 
4
+++-
M
src/nvim/main.c
 | 
13
+++++++++++++

2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
@@ -87,7 +87,9 @@ DEFAULTS
 
 EDITOR
 
-• TODO
+* On Windows, filename arguments on the command-line prefixed with "~\" or
+  "~/" are now expanded to the user's profile directory, not a relative path
+  to a literal "~" directory.
 
 EVENTS
 
diff --git a/src/nvim/main.c b/src/nvim/main.c
@@ -1444,6 +1444,19 @@ scripterror:
       ga_grow(&global_alist.al_ga, 1);
       char *p = xstrdup(argv[0]);
 
+      // On Windows expand "~\" or "~/" prefix in file names to profile directory.
+#ifdef MSWIN
+      if (*p == '~' && (p[1] == '\\' || p[1] == '/')) {
+        char *profile_dir = vim_getenv("HOME");
+        size_t size = strlen(profile_dir) + strlen(p);
+        char *tilde_expanded = xmalloc(size);
+        snprintf(tilde_expanded, size, "%s%s", profile_dir, p + 1);
+        xfree(p);
+        xfree(profile_dir);
+        p = tilde_expanded;
+      }
+#endif
+
       if (parmp->diff_mode && os_isdir(p) && GARGCOUNT > 0
           && !os_isdir(alist_name(&GARGLIST[0]))) {
         char *r = concat_fnames(p, path_tail(alist_name(&GARGLIST[0])), true);