Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/execable.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/execable.c (modified) (1 diff)

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

@@ -69 +69 @@
 
 #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[])
+/* 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[])
 {
-    return execvp(find_applet_by_name(file) >= 0 ? bb_busybox_exec_path : file,
-                    argv);
+    if (find_applet_by_name(file) >= 0)
+        execvp(bb_busybox_exec_path, argv);
+    return execvp(file, argv);
 }
 #endif