aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2019-04-01 22:14:33 +0900
committererw7 <erw7.github@gmail.com>2019-04-01 22:14:33 +0900
commite62f4cc1226c27d1628437540f12e0837e8239b7 (patch)
treed71c7fc4a627ac5aee12512d6dd07f41bca2e6a0
parentcc6d3f79031cdae42f0717547d76c27e63e9fe07 (diff)
downloadrneovim-e62f4cc1226c27d1628437540f12e0837e8239b7.tar.gz
rneovim-e62f4cc1226c27d1628437540f12e0837e8239b7.tar.bz2
rneovim-e62f4cc1226c27d1628437540f12e0837e8239b7.zip
fs.c: Move sh check of is_executable_ext to outside of loop
-rw-r--r--src/nvim/os/fs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 5c71abd000..71e76e2a78 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -303,6 +303,7 @@ static bool is_executable(const char *name, char_u **abspath)
static bool is_executable_ext(char *name, char_u **abspath)
FUNC_ATTR_NONNULL_ARG(1, 2)
{
+ const bool is_unix_shell = strstr((char *)path_tail(p_sh), "sh") != NULL;
char *nameext = strrchr(name, '.');
size_t nameext_len = nameext ? strlen(nameext) : 0;
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);
size_t ext_len = (size_t)(ext_end - ext);
STRLCPY(buf_end, ext, ext_len + 1);
- bool in_pathext = (strstr((char *)path_tail(p_sh), "sh") != NULL)
- || (nameext_len == ext_len
- && 0 == mb_strnicmp((char_u *)nameext, (char_u *)ext, ext_len));
+ bool in_pathext = nameext_len == 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)) {
return true;
}