diff options
| author | Enan Ajmain <3nan.ajmain@gmail.com> | 2022-07-18 06:00:08 +0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 17:00:08 -0700 |
| commit | 1b462705d049fa0cf2bb99bae9112b84abea8d5a (patch) | |
| tree | 67b375c191a2e81fd963f8f469edb1bd846fbb3f /src | |
| parent | 776913e32ea4526847b1fffe2959d2b1f7d67451 (diff) | |
| download | rneovim-1b462705d049fa0cf2bb99bae9112b84abea8d5a.tar.gz rneovim-1b462705d049fa0cf2bb99bae9112b84abea8d5a.tar.bz2 rneovim-1b462705d049fa0cf2bb99bae9112b84abea8d5a.zip | |
fix(windows):exepath, stdpath return wrong slashes #19111
exepath and stdpath should respect shellslash and return path with
proper file separator.
Closes #13787
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/funcs.c | 6 | ||||
| -rw-r--r-- | src/nvim/os/stdpaths.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 80586caf8e..022e2497b7 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -2048,6 +2048,12 @@ static void f_exepath(typval_T *argvars, typval_T *rettv, FunPtr fptr) (void)os_can_exe(tv_get_string(&argvars[0]), &path, true); +#ifdef BACKSLASH_IN_FILENAME + if (path != NULL) { + slash_adjust((char_u *)path); + } +#endif + rettv->v_type = VAR_STRING; rettv->vval.v_string = path; } diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index 5576e7ba07..59d315d44c 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -115,6 +115,10 @@ char *get_xdg_home(const XDGVarType idx) #else dir = concat_fnames_realloc(dir, "nvim", true); #endif + +#ifdef BACKSLASH_IN_FILENAME + slash_adjust((char_u *)dir); +#endif } return dir; } |