IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fs.c: Move sh check of is_executable_ext to outside of loop

Browse Source
This commit is contained in:
erw7 2019-04-01 22:14:33 +09:00
parent cc6d3f7903
commit e62f4cc122
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/os/fs.c
View File

@ -303,6 +303,7 @@ static bool is_executable(const char *name, char_u **abspath)
static bool is_executable_ext(char *name, char_u **abspath) static bool is_executable_ext(char *name, char_u **abspath)
FUNC_ATTR_NONNULL_ARG(1, 2) FUNC_ATTR_NONNULL_ARG(1, 2)
{ {
const bool is_unix_shell = strstr((char *)path_tail(p_sh), "sh") != NULL;
char *nameext = strrchr(name, '.'); char *nameext = strrchr(name, '.');
size_t nameext_len = nameext ? strlen(nameext) : 0; size_t nameext_len = nameext ? strlen(nameext) : 0;
xstrlcpy(os_buf, name, sizeof(os_buf)); xstrlcpy(os_buf, name, sizeof(os_buf));
@ -325,11 +326,10 @@ static bool is_executable_ext(char *name, char_u **abspath)
const char *ext_end = xstrchrnul(ext, ENV_SEPCHAR); const char *ext_end = xstrchrnul(ext, ENV_SEPCHAR);
size_t ext_len = (size_t)(ext_end - ext); size_t ext_len = (size_t)(ext_end - ext);
STRLCPY(buf_end, ext, ext_len + 1); STRLCPY(buf_end, ext, ext_len + 1);
bool in_pathext = (strstr((char *)path_tail(p_sh), "sh") != NULL) bool in_pathext = nameext_len == ext_len
|| (nameext_len == ext_len && 0 == mb_strnicmp((char_u *)nameext, (char_u *)ext, ext_len);
&& 0 == mb_strnicmp((char_u *)nameext, (char_u *)ext, ext_len));
if ((in_pathext && is_executable(name, abspath)) if (((in_pathext || is_unix_shell) && is_executable(name, abspath))
|| is_executable(os_buf, abspath)) { || is_executable(os_buf, abspath)) {
return true; return true;
} }