English speakers complained that it sounded awfully broken.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
#if ENABLE_DESKTOP
/* Much bloat just to support -a */
if (strchr(*argv, '/')) {
- if (execable_file(*argv)) {
+ if (file_is_executable(*argv)) {
puts(*argv);
continue;
}
char *path2 = xstrdup(path);
char *tmp = path2;
- p = find_execable(*argv, &tmp);
+ p = find_executable(*argv, &tmp);
if (!p)
status = EXIT_FAILURE;
else {
if (opt) {
/* -a: show matches in all PATH components */
if (tmp) {
- p = find_execable(*argv, &tmp);
+ p = find_executable(*argv, &tmp);
if (p)
goto print;
}
#else
/* Just ignoring -a */
if (strchr(*argv, '/')) {
- if (execable_file(*argv)) {
+ if (file_is_executable(*argv)) {
puts(*argv);
continue;
}
} else {
char *path2 = xstrdup(path);
char *tmp = path2;
- p = find_execable(*argv, &tmp);
+ p = find_executable(*argv, &tmp);
free(path2);
if (p) {
puts(p);
#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
int i ;
for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
- if (exists_execable(ext_dhcp_clients[i].name))
+ if (executable_exists(ext_dhcp_clients[i].name))
return execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
}
bb_error_msg("no dhcp clients found, using static interface shutdown");
#endif
-int execable_file(const char *name) FAST_FUNC;
-char *find_execable(const char *filename, char **PATHp) FAST_FUNC;
-int exists_execable(const char *filename) FAST_FUNC;
+int file_is_executable(const char *name) FAST_FUNC;
+char *find_executable(const char *filename, char **PATHp) FAST_FUNC;
+int executable_exists(const char *filename) FAST_FUNC;
/* BB_EXECxx always execs (it's not doing NOFORK/NOEXEC stuff),
* but it may exec busybox and call applet instead of searching PATH.
lib-y += default_error_retval.o
lib-y += device_open.o
lib-y += dump.o
-lib-y += execable.o
+lib-y += executable.o
lib-y += fclose_nonstdin.o
lib-y += fflush_stdout_and_exit.o
lib-y += fgets_str.o
+++ /dev/null
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-/* check if path points to an executable file;
- * return 1 if found;
- * return 0 otherwise;
- */
-int FAST_FUNC execable_file(const char *name)
-{
- struct stat s;
- return (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode));
-}
-
-/* search (*PATHp) for an executable file;
- * return allocated string containing full path if found;
- * PATHp points to the component after the one where it was found
- * (or NULL),
- * you may call find_execable again with this PATHp to continue
- * (if it's not NULL).
- * return NULL otherwise; (PATHp is undefined)
- * in all cases (*PATHp) contents will be trashed (s/:/NUL/).
- */
-char* FAST_FUNC find_execable(const char *filename, char **PATHp)
-{
- /* About empty components in $PATH:
- * http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
- * 8.3 Other Environment Variables - PATH
- * A zero-length prefix is a legacy feature that indicates the current
- * working directory. It appears as two adjacent colons ( "::" ), as an
- * initial colon preceding the rest of the list, or as a trailing colon
- * following the rest of the list.
- */
- char *p, *n;
-
- p = *PATHp;
- while (p) {
- n = strchr(p, ':');
- if (n)
- *n++ = '\0';
- p = concat_path_file(
- p[0] ? p : ".", /* handle "::" case */
- filename
- );
- if (execable_file(p)) {
- *PATHp = n;
- return p;
- }
- free(p);
- p = n;
- } /* on loop exit p == NULL */
- return p;
-}
-
-/* search $PATH for an executable file;
- * return 1 if found;
- * return 0 otherwise;
- */
-int FAST_FUNC exists_execable(const char *filename)
-{
- char *path = xstrdup(getenv("PATH"));
- char *tmp = path;
- char *ret = find_execable(filename, &tmp);
- free(path);
- free(ret);
- return ret != NULL;
-}
-
-#if ENABLE_FEATURE_PREFER_APPLETS
-/* just like the real execvp, but try to launch an applet named 'file' first */
-int FAST_FUNC BB_EXECVP(const char *file, char *const argv[])
-{
- if (find_applet_by_name(file) >= 0)
- execvp(bb_busybox_exec_path, argv);
- return execvp(file, argv);
-}
-#endif
-
-int FAST_FUNC BB_EXECVP_or_die(char **argv)
-{
- BB_EXECVP(argv[0], argv);
- /* SUSv3-mandated exit codes */
- xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
- bb_perror_msg_and_die("can't execute '%s'", argv[0]);
-}
--- /dev/null
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+
+#include "libbb.h"
+
+/* check if path points to an executable file;
+ * return 1 if found;
+ * return 0 otherwise;
+ */
+int FAST_FUNC file_is_executable(const char *name)
+{
+ struct stat s;
+ return (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode));
+}
+
+/* search (*PATHp) for an executable file;
+ * return allocated string containing full path if found;
+ * PATHp points to the component after the one where it was found
+ * (or NULL),
+ * you may call find_executable again with this PATHp to continue
+ * (if it's not NULL).
+ * return NULL otherwise; (PATHp is undefined)
+ * in all cases (*PATHp) contents will be trashed (s/:/NUL/).
+ */
+char* FAST_FUNC find_executable(const char *filename, char **PATHp)
+{
+ /* About empty components in $PATH:
+ * http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
+ * 8.3 Other Environment Variables - PATH
+ * A zero-length prefix is a legacy feature that indicates the current
+ * working directory. It appears as two adjacent colons ( "::" ), as an
+ * initial colon preceding the rest of the list, or as a trailing colon
+ * following the rest of the list.
+ */
+ char *p, *n;
+
+ p = *PATHp;
+ while (p) {
+ n = strchr(p, ':');
+ if (n)
+ *n++ = '\0';
+ p = concat_path_file(
+ p[0] ? p : ".", /* handle "::" case */
+ filename
+ );
+ if (file_is_executable(p)) {
+ *PATHp = n;
+ return p;
+ }
+ free(p);
+ p = n;
+ } /* on loop exit p == NULL */
+ return p;
+}
+
+/* search $PATH for an executable file;
+ * return 1 if found;
+ * return 0 otherwise;
+ */
+int FAST_FUNC executable_exists(const char *filename)
+{
+ char *path = xstrdup(getenv("PATH"));
+ char *tmp = path;
+ char *ret = find_executable(filename, &tmp);
+ free(path);
+ free(ret);
+ return ret != NULL;
+}
+
+#if ENABLE_FEATURE_PREFER_APPLETS
+/* just like the real execvp, but try to launch an applet named 'file' first */
+int FAST_FUNC BB_EXECVP(const char *file, char *const argv[])
+{
+ if (find_applet_by_name(file) >= 0)
+ execvp(bb_busybox_exec_path, argv);
+ return execvp(file, argv);
+}
+#endif
+
+int FAST_FUNC BB_EXECVP_or_die(char **argv)
+{
+ BB_EXECVP(argv[0], argv);
+ /* SUSv3-mandated exit codes */
+ xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
+ bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+}
return 0;
# endif
for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
- if (exists_execable(ext_dhcp_clients[i].name))
+ if (executable_exists(ext_dhcp_clients[i].name))
return execute(ext_dhcp_clients[i].startcmd, ifd, exec);
}
bb_error_msg("no dhcp clients found");
unsigned i;
for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
- if (exists_execable(ext_dhcp_clients[i].name)) {
+ if (executable_exists(ext_dhcp_clients[i].name)) {
result = execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
if (result)
break;
projects / oweals / busybox.git / commitdiff