Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-07-07 10:28:56 +00:00
Code Issues Projects Releases Wiki Activity

*: introduce and use xvfork()

Browse Source 
function                                             old     new   delta
time_main                                           1052    1285    +233
crontab_main                                         623     856    +233
ifupdown_main                                       2202    2403    +201
xvfork                                                 -      20     +20
passwd_main                                         1049    1053      +4
grave                                               1068    1066      -2
script_main                                          935     921     -14
vfork_or_die                                          20       -     -20
vfork_compressor                                     206     175     -31
open_as_user                                         109       -    -109
popen2                                               218       -    -218
edit_file                                            910     690    -220
run_command                                          268       -    -268
------------------------------------------------------------------------------
(add/remove: 1/4 grow/shrink: 4/4 up/down: 691/-882)         Total: -191 bytes
This commit is contained in:
Denis Vlasenko 2008-07-01 10:40:41 +00:00
parent 148f67af9d
commit 3da5572bfa
12 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/libunarchive/open_transformer.c
View File

@ -25,9 +25,7 @@ int FAST_FUNC open_transformer(int src_fd,
if (pid == -1)
bb_perror_msg_and_die("can't fork");
#else
pid = vfork();
if (pid == -1)
bb_perror_msg_and_die("can't vfork");
pid = xvfork();
#endif
if (pid == 0) {

4
archival/tar.c
View File

@ -536,9 +536,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
(void) &zip_exec;
#endif
gzipPid = vfork();
if (gzipPid < 0)
bb_perror_msg_and_die("can't vfork");
gzipPid = xvfork();
if (gzipPid == 0) {
/* child */

4
debianutils/start_stop_daemon.c
View File

@ -404,9 +404,7 @@ int start_stop_daemon_main(int argc ATTRIBUTE_UNUSED, char **argv)
/* DAEMON_DEVNULL_STDIO is superfluous -
* it's always done by bb_daemonize() */
#else
pid_t pid = vfork();
if (pid < 0) /* error */
bb_perror_msg_and_die("vfork");
pid_t pid = xvfork();
if (pid != 0) {
/* parent */
/* why _exit? the child may have changed the stack,

2
include/libbb.h
View File

@ -719,6 +719,8 @@ int bb_execvp(const char *file, char *const argv[]) FAST_FUNC;
#define BB_EXECLP(prog,cmd,...) execlp(prog,cmd, __VA_ARGS__)
#endif
pid_t xvfork(void) FAST_FUNC;
/* NOMMU friendy fork+exec */
pid_t spawn(char **argv) FAST_FUNC;
pid_t xspawn(char **argv) FAST_FUNC;

1
libbb/Kbuild
View File

@ -109,6 +109,7 @@ lib-y += xfunc_die.o
lib-y += xgetcwd.o
lib-y += xgethostbyname.o
lib-y += xreadlink.o
lib-y += xvfork.o
# conditionally compiled objects:
lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o

4
libbb/vfork_daemon_rexec.c
View File

@ -226,9 +226,7 @@ void FAST_FUNC forkexit_or_rexec(char **argv)
if (re_execed)
return;
pid = vfork();
if (pid < 0) /* wtf? */
bb_perror_msg_and_die("vfork");
pid = xvfork();
if (pid) /* parent */
exit(EXIT_SUCCESS);
/* child - re-exec ourself */

8
miscutils/crontab.c
View File

@ -38,10 +38,8 @@ static void change_user(const struct passwd *pas)
static void edit_file(const struct passwd *pas, const char *file)
{
const char *ptr;
int pid = vfork();
int pid = xvfork();
if (pid < 0) /* failure */
bb_perror_msg_and_die("vfork");
if (pid) { /* parent */
wait4pid(pid);
return;
@ -65,9 +63,7 @@ static int open_as_user(const struct passwd *pas, const char *file)
pid_t pid;
char c;
pid = vfork();
if (pid < 0) /* ERROR */
bb_perror_msg_and_die("vfork");
pid = xvfork();
if (pid) { /* PARENT */
if (wait4pid(pid) == 0) {
/* exitcode 0: child says it can read */

4
miscutils/time.c
View File

@ -372,9 +372,7 @@ static void run_command(char *const *cmd, resource_t *resp)
void (*quit_signal)(int);
resp->elapsed_ms = monotonic_us() / 1000;
pid = vfork(); /* Run CMD as child process. */
if (pid < 0)
bb_error_msg_and_die("cannot fork");
pid = xvfork(); /* Run CMD as child process. */
if (pid == 0) { /* If child. */
/* Don't cast execvp arguments; that causes errors on some systems,
versus merely warnings if the cast is left off. */

7
networking/ifupdown.c
View File

@ -1008,12 +1008,9 @@ static int popen2(FILE **in, FILE **out, char *command, char *param)
xpiped_pair(outfd);
fflush(NULL);
pid = vfork();
pid = xvfork();
switch (pid) {
case -1: /* failure */
bb_perror_msg_and_die("vfork");
case 0: /* child */
if (pid == 0) { /* child */
/* NB: close _first_, then move fds! */
close(infd.wr);
close(outfd.rd);

11
networking/sendmail.c
View File

@ -120,15 +120,6 @@ static void signal_handler(int signo)
#undef err
}
/* libbb candidate */
static pid_t vfork_or_die(void)
{
pid_t pid = vfork();
if (pid < 0)
bb_perror_msg_and_die("vfork");
return pid;
}
static void launch_helper(const char **argv)
{
// setup vanilla unidirectional pipes interchange
@ -137,7 +128,7 @@ static void launch_helper(const char **argv)
xpipe(pipes);
xpipe(pipes+2);
helper_pid = vfork_or_die();
helper_pid = xvfork();
idx = (!helper_pid) * 2;
xdup2(pipes[idx], STDIN_FILENO);
xdup2(pipes[3-idx], STDOUT_FILENO);

6
shell/hush.c
View File

@ -3096,9 +3096,11 @@ static FILE *generate_stream_from_list(struct pipe *head)
* huge=`cat TESTFILE` # will block here forever
* echo OK
*/
pid = BB_MMU ? fork() : vfork();
pid = BB_MMU ? fork() : xvfork();
#if BB_MMU
if (pid < 0)
bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
bb_perror_msg_and_die("fork");
#endif
if (pid == 0) { /* child */
if (ENABLE_HUSH_JOB)
die_sleep = 0; /* let nofork's xfuncs die */

5
util-linux/script.c
View File

@ -87,10 +87,7 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv)
/* TODO: SIGWINCH? pass window size changes down to slave? */
child_pid = vfork();
if (child_pid < 0) {
bb_perror_msg_and_die("vfork");
}
child_pid = xvfork();
if (child_pid) {
/* parent */