mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-03 17:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify mch_can_exe extracting is_executable_in_path.

Browse Source
This commit is contained in:
Thomas Wienecke
2014-03-06 14:44:07 +01:00
committed by Thiago de Arruda
parent ef03a8c52a
commit 9fc67aa7a3
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/os/fs.c
View File

@@ -212,31 +212,16 @@ static int is_executable(char_u *name)
return FALSE; return FALSE;
} }
/* static int is_executable_in_path(char_u *name)
* Return 1 if "name" can be found in $PATH and executed, 0 if not.
* Return -1 if unknown.
*/
int mch_can_exe(char_u *name)
{ {
char_u *buf; char_u *path = (char_u *)getenv("PATH");
char_u *path, *e;
int retval;
/* If it's an absolute or relative path don't need to use $PATH. */
if (mch_is_absolute_path(name) ||
(name[0] == '.' && (name[1] == '/' ||
(name[1] == '.' && name[2] == '/')))) {
return is_executable(name);
}
path = (char_u *)getenv("PATH");
/* PATH environment variable does not exist or is empty. */ /* PATH environment variable does not exist or is empty. */
if (path == NULL || *path == NUL) { if (path == NULL || *path == NUL) {
return -1; return -1;
} }
int buf_len = STRLEN(name) + STRLEN(path) + 2; int buf_len = STRLEN(name) + STRLEN(path) + 2;
buf = alloc((unsigned)(buf_len)); char_u *buf = alloc((unsigned)(buf_len));
if (buf == NULL) { if (buf == NULL) {
return -1; return -1;
} }
@@ -246,32 +231,46 @@ int mch_can_exe(char_u *name)
* is an executable file. * is an executable file.
*/ */
for (;; ) { for (;; ) {
e = (char_u *)strchr((char *)path, ':'); char_u *e = (char_u *)strchr((char *)path, ':');
if (e == NULL) { if (e == NULL) {
e = path + STRLEN(path); e = path + STRLEN(path);
} }
if (e - path <= 1) { /* empty entry means current dir */ /* Glue together the given directory from $PATH with name and save into
STRCPY(buf, "./"); * buf. */
} else { vim_strncpy(buf, path, e - path);
vim_strncpy(buf, path, e - path);
add_pathsep(buf);
}
append_path((char *) buf, (char *) name, buf_len); append_path((char *) buf, (char *) name, buf_len);
retval = is_executable(buf); if (is_executable(buf)) {
if (retval == OK) { /* Found our executable. Free buf and return. */
break; vim_free(buf);
return OK;
} }
if (*e != ':') { if (*e != ':') {
break; /* End of $PATH without without finding any executable called name. */
vim_free(buf);
return FALSE;
} }
path = e + 1; path = e + 1;
} }
vim_free(buf); return FALSE;
return retval; }
/*
* Return 1 if "name" can be found in $PATH and executed, 0 if not.
* Return -1 if unknown.
*/
int mch_can_exe(char_u *name)
{
/* If it's an absolute or relative path don't need to use $PATH. */
if (mch_is_absolute_path(name) ||
(name[0] == '.' && (name[1] == '/' ||
(name[1] == '.' && name[2] == '/')))) {
return is_executable(name);
}
return is_executable_in_path(name);
} }