mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-16 06:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: PATHEXT function

Browse Source
This commit is contained in:
erw7
2019-01-20 14:12:00 +09:00
committed by Justin M. Keyes
parent 3be5aa1a34
commit 70ac7c876b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,10 +254,7 @@ bool os_can_exe(const char_u *name, char_u **abspath, bool use_path)
if (no_path) { if (no_path) {
#ifdef WIN32 #ifdef WIN32
const char *pathext = os_getenv("PATHEXT"); const char *pathext = get_pathext();
if (!pathext) {
pathext = ".com;.exe;.bat;.cmd";
}
if ((is_extension_executable((char *)name) if ((is_extension_executable((char *)name)
&& is_executable((char *)name, abspath)) && is_executable((char *)name, abspath))
|| is_executable_ext((char *)name, pathext, abspath)) { || is_executable_ext((char *)name, pathext, abspath)) {
@@ -276,6 +273,15 @@ bool os_can_exe(const char_u *name, char_u **abspath, bool use_path)
} }
#ifdef WIN32 #ifdef WIN32
static const char *get_pathext(void)
{
const char *pathext = os_getenv("PATHEXT");
if (!pathext) {
pathext = ".com;.exe;.bat;.cmd";
}
return pathext;
}
/// Returns true if extension of `name` is executable file exteinsion. /// Returns true if extension of `name` is executable file exteinsion.
static bool is_extension_executable(const char *name) static bool is_extension_executable(const char *name)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
@@ -296,10 +302,7 @@ static bool is_extension_executable(const char *name)
return true; return true;
} }
const char *pathext = os_getenv("PATHEXT"); const char *pathext = get_pathext();
if (!pathext) {
pathext = ".com;.exe;.bat;.cmd";
}
const char *ext_pos = name + STRLEN(name) - 1; const char *ext_pos = name + STRLEN(name) - 1;
while (name != ext_pos) { while (name != ext_pos) {
if (*ext_pos == '\\' || *ext_pos == '/') { if (*ext_pos == '\\' || *ext_pos == '/') {
@@ -424,10 +427,7 @@ static bool is_executable_in_path(const char_u *name, char_u **abspath)
size_t buf_len = STRLEN(name) + strlen(path) + 2; size_t buf_len = STRLEN(name) + strlen(path) + 2;
#ifdef WIN32 #ifdef WIN32
const char *pathext = os_getenv("PATHEXT"); const char *pathext = get_pathext();
if (!pathext) {
pathext = ".com;.exe;.bat;.cmd";
}
buf_len += strlen(pathext); buf_len += strlen(pathext);
#endif #endif