emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/libbb.h
View File

@ -867,11 +867,13 @@ int exists_execable(const char *filename) FAST_FUNC;
* but it may exec busybox and call applet instead of searching PATH. * but it may exec busybox and call applet instead of searching PATH.
*/ */
#if ENABLE_FEATURE_PREFER_APPLETS #if ENABLE_FEATURE_PREFER_APPLETS
int bb_execvp(const char *file, char *const argv[]) FAST_FUNC; int BB_EXECVP(const char *file, char *const argv[]) FAST_FUNC;
#define BB_EXECVP(prog,cmd) bb_execvp(prog,cmd)
#define BB_EXECLP(prog,cmd,...) \ #define BB_EXECLP(prog,cmd,...) \
execlp((find_applet_by_name(prog) >= 0) ? CONFIG_BUSYBOX_EXEC_PATH : prog, \ do { \
cmd, __VA_ARGS__) if (find_applet_by_name(prog) >= 0) \
execlp(bb_busybox_exec_path, cmd, __VA_ARGS__); \
execlp(prog, cmd, __VA_ARGS__); \
} while (0)
#else #else
#define BB_EXECVP(prog,cmd) execvp(prog,cmd) #define BB_EXECVP(prog,cmd) execvp(prog,cmd)
#define BB_EXECLP(prog,cmd,...) execlp(prog,cmd,__VA_ARGS__) #define BB_EXECLP(prog,cmd,...) execlp(prog,cmd,__VA_ARGS__)

10
libbb/execable.c
View File

@ -68,12 +68,12 @@ int FAST_FUNC exists_execable(const char *filename)
} }
#if ENABLE_FEATURE_PREFER_APPLETS #if ENABLE_FEATURE_PREFER_APPLETS
/* just like the real execvp, but try to launch an applet named 'file' first /* 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[])
int FAST_FUNC bb_execvp(const char *file, char *const argv[])
{ {
return execvp(find_applet_by_name(file) >= 0 ? bb_busybox_exec_path : file, if (find_applet_by_name(file) >= 0)
argv); execvp(bb_busybox_exec_path, argv);
return execvp(file, argv);
} }
#endif #endif