diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-05 15:19:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-05 15:19:32 +0100 |
| commit | 066029ef92b45dc4bd21a353b1fac25841062c26 (patch) | |
| tree | cc015c811077be548eb1bb6be0bbf0da28f4d154 /src | |
| parent | a382868115e8f8e44c6a85bb9587f8eb31fa0033 (diff) | |
| download | vim-066029ef92b45dc4bd21a353b1fac25841062c26.zip | |
patch 8.0.0419: test for v:progpath fails on MS-Windows
Problem: Test for v:progpath fails on MS-Windows.
Solution: Expand to full path. Also add ".exe" when the path is an absolute
path.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 27 | ||||
| -rw-r--r-- | src/os_win32.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 21 insertions, 15 deletions
diff --git a/src/main.c b/src/main.c index 8669e33a0..0f9f3fff4 100644 --- a/src/main.c +++ b/src/main.c @@ -3533,31 +3533,30 @@ time_msg( set_progpath(char_u *argv0) { char_u *val = argv0; -#ifdef WIN32 - char_u *path = NULL; -#else - char_u buf[MAXPATHL]; -#endif /* A relative path containing a "/" will become invalid when using ":cd", * turn it into a full path. - * On MS-Windows "vim.exe" is found in the current directory, thus also do - * it when there is no path and the file exists. */ - if (!mch_isFullName(argv0)) - { + * On MS-Windows "vim" should be expanded to "vim.exe", thus always do + * this. */ # ifdef WIN32 - if (mch_can_exe(argv0, &path, FALSE) && path != NULL) - val = path; + char_u *path = NULL; + + if (mch_can_exe(argv0, &path, FALSE) && path != NULL) + val = path; # else + char_u buf[MAXPATHL]; + + if (!mch_isFullName(argv0)) + { if (gettail(argv0) != argv0 && vim_FullName(argv0, buf, MAXPATHL, TRUE) != FAIL) val = buf; -# endif } +# endif set_vim_var_string(VV_PROGPATH, val, -1); -#ifdef WIN32 +# ifdef WIN32 vim_free(path); -#endif +# endif } #endif /* NO_VIM_MAIN */ diff --git a/src/os_win32.c b/src/os_win32.c index dd3e6def5..7081e037d 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -1921,7 +1921,12 @@ executable_exists(char *name, char_u **path, int use_path) if (mch_getperm(name) != -1 && !mch_isdir(name)) { if (path != NULL) - *path = vim_strsave((char_u *)name); + { + if (mch_isFullName(name)) + *path = vim_strsave((char_u *)name); + else + *path = FullName_save((char_u *)name, FALSE); + } return TRUE; } return FALSE; diff --git a/src/version.c b/src/version.c index 6558b01f3..834f1442e 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 419, +/**/ 418, /**/ 417, |