aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

patch 8.0.0416: setting v:progpath is not quite right

Browse Source 
Problem:    Setting v:progpath is not quite right.
Solution:   On MS-Windows add the extension. On Unix use the full path for a
            relative directory. (partly by James McCoy, closes #1531)
This commit is contained in:
Bram Moolenaar
2017-03-05 14:29:12 +01:00
parent 0f9ea22c11
commit 4366319697
4 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/os_win32.c
View File

@@ -1902,17 +1902,31 @@ theend:
#endif
/*
* Return TRUE if "name" is in $PATH.
* If "use_path" is TRUE: Return TRUE if "name" is in $PATH.
* If "use_path" is FALSE: Return TRUE if "name" exists.
* When returning TRUE and "path" is not NULL save the path and set "*path" to
* the allocated memory.
* TODO: Should somehow check if it's really executable.
*/
static int
executable_exists(char *name, char_u **path)
executable_exists(char *name, char_u **path, int use_path)
{
char *dum;
char fname[_MAX_PATH];
char *curpath, *newpath;
long n;
if (!use_path)
{
if (mch_getperm(name) != -1 && !mch_isdir(name))
{
if (path != NULL)
*path = vim_strsave((char_u *)name);
return TRUE;
}
return FALSE;
}
#ifdef FEAT_MBYTE
if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
{
@@ -2038,7 +2052,7 @@ mch_init(void)
vimrun_path = (char *)vim_strsave(vimrun_location);
s_dont_use_vimrun = FALSE;
}
else if (executable_exists("vimrun.exe", NULL))
else if (executable_exists("vimrun.exe", NULL, TRUE))
s_dont_use_vimrun = FALSE;
/* Don't give the warning for a missing vimrun.exe right now, but only
@@ -2052,7 +2066,7 @@ mch_init(void)
* If "finstr.exe" doesn't exist, use "grep -n" for 'grepprg'.
* Otherwise the default "findstr /n" is used.
*/
if (!executable_exists("findstr.exe", NULL))
if (!executable_exists("findstr.exe", NULL, TRUE))
set_option_value((char_u *)"grepprg", 0, (char_u *)"grep -n", 0);
#ifdef FEAT_CLIPBOARD
@@ -3358,9 +3372,10 @@ mch_writable(char_u *name)
}
/*
* Return 1 if "name" can be executed, 0 if not.
* Return TRUE if "name" can be executed, FALSE if not.
* If "use_path" is FALSE only check if "name" is executable.
* Return -1 if unknown.
* When returning TRUE and "path" is not NULL save the path and set "*path" to
* the allocated memory.
*/
int
mch_can_exe(char_u *name, char_u **path, int use_path)
@@ -3371,17 +3386,12 @@ mch_can_exe(char_u *name, char_u **path, int use_path)
if (len >= _MAX_PATH) /* safety check */
return FALSE;
if (!use_path)
{
/* TODO: check if file is really executable. */
return mch_getperm(name) != -1 && !mch_isdir(name);
}
/* 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)
if (executable_exists((char *)name, path))
if (executable_exists((char *)name, path, use_path))
return TRUE;
/*
@@ -3403,7 +3413,7 @@ mch_can_exe(char_u *name, char_u **path, int use_path)
}
else
copy_option_part(&p, buf + len, _MAX_PATH - len, ";");
if (executable_exists((char *)buf, path))
if (executable_exists((char *)buf, path, use_path))
return TRUE;
}
return FALSE;