libbb: make BB_EXECVP/LP try to exec real binary if there's no /proc/self/exe

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-02-02 03:28:56 +01:00
parent 099e528919
commit c71b469f5d
3 changed files with 18 additions and 16 deletions

View File

@@ -68,12 +68,12 @@ int FAST_FUNC 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 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