Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/execable.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/execable.c (modified) (7 diffs)

branches/2.2.9/mindi-busybox/libbb/execable.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -14 +14 @@
  * return 0 otherwise;
  */
-int execable_file(const char *name)
+int FAST_FUNC execable_file(const char *name)
 {
     struct stat s;
@@ -20 +20 @@
 }
 
-/* search $PATH for an executable file;
+/* search (*PATHp) for an executable file;
  * return allocated string containing full path if found;
- * return NULL otherwise;
+ *  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 *find_execable(const char *filename)
+char* FAST_FUNC find_execable(const char *filename, char **PATHp)
 {
-    char *path, *p, *n;
+    char *p, *n;
 
-    p = path = xstrdup(getenv("PATH"));
+    p = *PATHp;
     while (p) {
         n = strchr(p, ':');
@@ -36 +41 @@
             p = concat_path_file(p, filename);
             if (execable_file(p)) {
-                free(path);
+                *PATHp = n;
                 return p;
             }
@@ -42 +47 @@
         }
         p = n;
-    }
-    free(path);
-    return NULL;
+    } /* on loop exit p == NULL */
+    return p;
 }
 
@@ -51 +55 @@
  * return 0 otherwise;
  */
-int exists_execable(const char *filename)
+int FAST_FUNC exists_execable(const char *filename)
 {
-    char *ret = find_execable(filename);
+    char *path = xstrdup(getenv("PATH"));
+    char *tmp = path;
+    char *ret = find_execable(filename, &tmp);
+    free(path);
     if (ret) {
         free(ret);
@@ -64 +71 @@
 /* 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) ? bb_busybox_exec_path : file,
+    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]);
+}