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

sendmail: fix wrong vfork usage here too

Browse Source 
*: shorten error texts

function                                             old     new   delta
launch_helper                                          -     151    +151
vfork_or_die                                          20       -     -20
sendgetmail_main                                    1946    1848     -98
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/1 up/down: 151/-118)           Total: 33 bytes
This commit is contained in:
Denis Vlasenko
2008-07-01 16:09:07 +00:00
parent 82604e9730
commit fa0b56db76
6 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
networking/nc.c
View File

@@ -150,12 +150,9 @@ int nc_main(int argc, char **argv)
goto accept_again;
}
/* child (or main thread if no multiple -l) */
if (cfd) {
dup2(cfd, 0);
close(cfd);
}
dup2(0, 1);
dup2(0, 2);
xmove_fd(cfd, 0);
xdup2(0, 1);
xdup2(0, 2);
USE_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
/* Don't print stuff or it will go over the wire.... */
_exit(127);

13
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,9 @@ static void launch_helper(const char **argv)
xpipe(pipes);
xpipe(pipes+2);
helper_pid = vfork_or_die();
helper_pid = vfork();
if (helper_pid < 0)
bb_perror_msg_and_die("vfork");
idx = (!helper_pid) * 2;
xdup2(pipes[idx], STDIN_FILENO);
xdup2(pipes[3-idx], STDOUT_FILENO);