mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-13 05:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim_getenv: Use v:progpath instead of os_exepath.

Browse Source
This commit is contained in:
Justin M. Keyes
2017-05-15 02:12:52 +02:00
parent 4c5398bc40
commit 5bda5c5bf2
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/os/env.c
View File

@@ -634,18 +634,17 @@ char *vim_getenv(const char *name)
char exe_name[MAXPATHL]; char exe_name[MAXPATHL];
// Find runtime path relative to the nvim binary: ../share/nvim/runtime // Find runtime path relative to the nvim binary: ../share/nvim/runtime
if (vim_path == NULL) { if (vim_path == NULL) {
size_t exe_name_len = MAXPATHL; xstrlcpy(exe_name, (char *)get_vim_var_str(VV_PROGPATH),
if (os_exepath(exe_name, &exe_name_len) == 0) { sizeof(exe_name));
char *path_end = (char *)path_tail_with_sep((char_u *)exe_name); char *path_end = (char *)path_tail_with_sep((char_u *)exe_name);
*path_end = '\0'; // remove the trailing "nvim.exe" *path_end = '\0'; // remove the trailing "nvim.exe"
path_end = (char *)path_tail((char_u *)exe_name); path_end = (char *)path_tail((char_u *)exe_name);
*path_end = '\0'; // remove the trailing "bin/" *path_end = '\0'; // remove the trailing "bin/"
if (append_path( if (append_path(
exe_name, exe_name,
"share" _PATHSEPSTR "nvim" _PATHSEPSTR "runtime" _PATHSEPSTR, "share" _PATHSEPSTR "nvim" _PATHSEPSTR "runtime" _PATHSEPSTR,
MAXPATHL) == OK) { MAXPATHL) == OK) {
vim_path = exe_name; // -V507 vim_path = exe_name; // -V507
}
} }
} }