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

Attempt at fixing bug 815 by upgrading bb_spawn() so that builtins are at

Browse Source 
the start of the path.  (This should be under the same config option as
the standalone shell, but right now that's buried in the shell menu.)

Also add the ability to specify CONFIG_BUSYBOX_EXEC_PATH with /proc/self/exe
as an overrideable default.
This commit is contained in:
Rob Landley
2006-06-14 01:24:33 +00:00
parent 575c8bacda
commit c7ddefc062
4 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libbb/xfuncs.c
View File

@ -9,6 +9,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@ -189,13 +190,14 @@ pid_t bb_spawn(char **argv)
{
static int failed;
pid_t pid;
void *app = find_applet_by_name(argv[0]);
// Be nice to nommu machines.
failed = 0;
pid = vfork();
if (pid < 0) return pid;
if (!pid) {
execvp(*argv, argv);
execvp(app ? CONFIG_BUSYBOX_EXEC_PATH : *argv, argv);
// We're sharing a stack with blocked parent, let parent know we failed
// and then exit to unblock parent (but don't run atexit() stuff, which
@ -216,3 +218,15 @@ pid_t bb_xspawn(char **argv)
return pid;
}
#endif
#ifdef L_wait4
int wait4pid(int pid)
{
int status;
if (pid == -1 || waitpid(pid, &status, 0) == -1) return -1;
if (WIFEXITED(status)) return WEXITSTATUS(status);
if (WIFSIGNALED(status)) return WTERMSIG(status);
return 0;
}
#endif