mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.1.1095: MS-Windows: executable() fails on very long filename
Problem: MS-Windows: executable() fails on very long filename. Solution: (Ken Takata, closes #4015)
This commit is contained in:
parent
5209334c55
commit
8662189736
@ -3299,14 +3299,17 @@ mch_writable(char_u *name)
|
|||||||
int
|
int
|
||||||
mch_can_exe(char_u *name, char_u **path, int use_path)
|
mch_can_exe(char_u *name, char_u **path, int use_path)
|
||||||
{
|
{
|
||||||
char_u buf[_MAX_PATH];
|
// WinNT and later can use _MAX_PATH wide characters for a pathname, which
|
||||||
|
// means that the maximum pathname is _MAX_PATH * 3 bytes when 'enc' is
|
||||||
|
// UTF-8.
|
||||||
|
char_u buf[_MAX_PATH * 3];
|
||||||
int len = (int)STRLEN(name);
|
int len = (int)STRLEN(name);
|
||||||
char_u *p, *saved;
|
char_u *p, *saved;
|
||||||
|
|
||||||
if (len >= _MAX_PATH) /* safety check */
|
if (len >= sizeof(buf)) // safety check
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
/* Ty using the name directly when a Unix-shell like 'shell'. */
|
// Try using the name directly when a Unix-shell like 'shell'.
|
||||||
if (strstr((char *)gettail(p_sh), "sh") != NULL)
|
if (strstr((char *)gettail(p_sh), "sh") != NULL)
|
||||||
if (executable_exists((char *)name, path, use_path))
|
if (executable_exists((char *)name, path, use_path))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -3339,7 +3342,7 @@ mch_can_exe(char_u *name, char_u **path, int use_path)
|
|||||||
}
|
}
|
||||||
vim_free(saved);
|
vim_free(saved);
|
||||||
|
|
||||||
vim_strncpy(buf, name, _MAX_PATH - 1);
|
vim_strncpy(buf, name, sizeof(buf) - 1);
|
||||||
p = mch_getenv("PATHEXT");
|
p = mch_getenv("PATHEXT");
|
||||||
if (p == NULL)
|
if (p == NULL)
|
||||||
p = (char_u *)".com;.exe;.bat;.cmd";
|
p = (char_u *)".com;.exe;.bat;.cmd";
|
||||||
@ -3354,7 +3357,7 @@ mch_can_exe(char_u *name, char_u **path, int use_path)
|
|||||||
++p;
|
++p;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
copy_option_part(&p, buf + len, _MAX_PATH - len, ";");
|
copy_option_part(&p, buf + len, sizeof(buf) - len, ";");
|
||||||
if (executable_exists((char *)buf, path, use_path))
|
if (executable_exists((char *)buf, path, use_path))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@ -944,6 +944,17 @@ func Test_Executable()
|
|||||||
endif
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_executable_longname()
|
||||||
|
if !has('win32')
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
|
||||||
|
let fname = 'X' . repeat('あ', 200) . '.bat'
|
||||||
|
call writefile([], fname)
|
||||||
|
call assert_equal(1, executable(fname))
|
||||||
|
call delete(fname)
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_hostname()
|
func Test_hostname()
|
||||||
let hostname_vim = hostname()
|
let hostname_vim = hostname()
|
||||||
if has('unix')
|
if has('unix')
|
||||||
|
@ -771,6 +771,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1095,
|
||||||
/**/
|
/**/
|
||||||
1094,
|
1094,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user