thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0453: MS-Windows: executable() is not reliable

Browse Source 
Problem:    MS-Windows: executable() is not reliable.
Solution:   Use $PATHEXT properly. (Yasuhiro Matsumoto, closes #3412)
This commit is contained in:
Bram Moolenaar
2018-10-06 15:18:45 +02:00
parent 7554c548a4
commit 8295666dc2
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/os_win32.c
View File

@@ -3535,21 +3535,44 @@ mch_can_exe(char_u *name, char_u **path, int use_path)
{
char_u buf[_MAX_PATH];
int len = (int)STRLEN(name);
char_u *p;
char_u *p, *saved;
if (len >= _MAX_PATH) /* safety check */
return FALSE;
/* If there already is an extension try using the name directly. Also do
* this with a Unix-shell like 'shell'. */
if (vim_strchr(gettail(name), '.') != NULL
|| strstr((char *)gettail(p_sh), "sh") != NULL)
/* Ty using the name directly when a Unix-shell like 'shell'. */
if (strstr((char *)gettail(p_sh), "sh") != NULL)
if (executable_exists((char *)name, path, use_path))
return TRUE;
/*
* Loop over all extensions in $PATHEXT.
*/
p = mch_getenv("PATHEXT");
if (p == NULL)
p = (char_u *)".com;.exe;.bat;.cmd";
saved = vim_strsave(p);
if (saved == NULL)
return FALSE;
p = saved;
while (*p)
{
char_u *tmp = vim_strchr(p, ';');
if (tmp != NULL)
*tmp = NUL;
if (_stricoll((char *)name + len - STRLEN(p), (char *)p) == 0
&& executable_exists((char *)name, path, use_path))
{
vim_free(saved);
return TRUE;
}
if (tmp == NULL)
break;
p = tmp + 1;
}
vim_free(saved);
vim_strncpy(buf, name, _MAX_PATH - 1);
p = mch_getenv("PATHEXT");
if (p == NULL)