diff options
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/ifupdown.c | 7 | ||||
| -rw-r--r-- | networking/sendmail.c | 11 |
2 files changed, 3 insertions, 15 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index c12391863..8caff3f4d 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -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); diff --git a/networking/sendmail.c b/networking/sendmail.c index 1c23ca290..c195cc021 100644 --- a/networking/sendmail.c +++ b/networking/sendmail.c @@ -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); |