lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / libbb / execable.c

diff --git a/libbb/execable.c b/libbb/execable.c
index 5c2b4505cbe6864d1c8d534d02364db52f6cff87..d37640007791e431641c554172c0c96ef9c52384 100644 (file)
--- a/libbb/execable.c
+++ b/libbb/execable.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -13,7 +13,7 @@
  * return 1 if found;
  * return 0 otherwise;
  */
-int execable_file(const char *name)
+int FAST_FUNC execable_file(const char *name)
 {
        struct stat s;
        return (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode));
@@ -28,7 +28,7 @@ int execable_file(const char *name)
  * return NULL otherwise; (PATHp is undefined)
  * in all cases (*PATHp) contents will be trashed (s/:/NUL/).
  */
-char *find_execable(const char *filename, char **PATHp)
+char* FAST_FUNC find_execable(const char *filename, char **PATHp)
 {
        char *p, *n;
 
@@ -54,7 +54,7 @@ char *find_execable(const char *filename, char **PATHp)
  * return 1 if found;
  * return 0 otherwise;
  */
-int exists_execable(const char *filename)
+int FAST_FUNC exists_execable(const char *filename)
 {
        char *path = xstrdup(getenv("PATH"));
        char *tmp = path;
@@ -70,9 +70,17 @@ int exists_execable(const char *filename)
 #if ENABLE_FEATURE_PREFER_APPLETS
 /* just like the real execvp, but try to launch an applet named 'file' first
  */
-int bb_execvp(const char *file, char *const argv[])
+int FAST_FUNC bb_execvp(const char *file, char *const argv[])
 {
        return execvp(find_applet_by_name(file) >= 0 ? bb_busybox_exec_path : 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]);
+}