mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
sendmail: fix wrong vfork usage here too
*: 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:
parent
82604e9730
commit
fa0b56db76
@ -23,11 +23,11 @@ int FAST_FUNC open_transformer(int src_fd,
|
|||||||
#if BB_MMU
|
#if BB_MMU
|
||||||
pid = fork();
|
pid = fork();
|
||||||
if (pid == -1)
|
if (pid == -1)
|
||||||
bb_perror_msg_and_die("can't fork");
|
bb_perror_msg_and_die("vfork" + 1);
|
||||||
#else
|
#else
|
||||||
pid = vfork();
|
pid = vfork();
|
||||||
if (pid == -1)
|
if (pid == -1)
|
||||||
bb_perror_msg_and_die("can't vfork");
|
bb_perror_msg_and_die("vfork");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
|
@ -538,7 +538,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
|
|||||||
|
|
||||||
gzipPid = vfork();
|
gzipPid = vfork();
|
||||||
if (gzipPid < 0)
|
if (gzipPid < 0)
|
||||||
bb_perror_msg_and_die("can't vfork");
|
bb_perror_msg_and_die("vfork");
|
||||||
|
|
||||||
if (gzipPid == 0) {
|
if (gzipPid == 0) {
|
||||||
/* child */
|
/* child */
|
||||||
|
@ -374,7 +374,7 @@ static void run_command(char *const *cmd, resource_t *resp)
|
|||||||
resp->elapsed_ms = monotonic_us() / 1000;
|
resp->elapsed_ms = monotonic_us() / 1000;
|
||||||
pid = vfork(); /* Run CMD as child process. */
|
pid = vfork(); /* Run CMD as child process. */
|
||||||
if (pid < 0)
|
if (pid < 0)
|
||||||
bb_error_msg_and_die("cannot fork");
|
bb_perror_msg_and_die("fork");
|
||||||
if (pid == 0) { /* If child. */
|
if (pid == 0) { /* If child. */
|
||||||
/* Don't cast execvp arguments; that causes errors on some systems,
|
/* Don't cast execvp arguments; that causes errors on some systems,
|
||||||
versus merely warnings if the cast is left off. */
|
versus merely warnings if the cast is left off. */
|
||||||
|
@ -150,12 +150,9 @@ int nc_main(int argc, char **argv)
|
|||||||
goto accept_again;
|
goto accept_again;
|
||||||
}
|
}
|
||||||
/* child (or main thread if no multiple -l) */
|
/* child (or main thread if no multiple -l) */
|
||||||
if (cfd) {
|
xmove_fd(cfd, 0);
|
||||||
dup2(cfd, 0);
|
xdup2(0, 1);
|
||||||
close(cfd);
|
xdup2(0, 2);
|
||||||
}
|
|
||||||
dup2(0, 1);
|
|
||||||
dup2(0, 2);
|
|
||||||
USE_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
|
USE_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
|
||||||
/* Don't print stuff or it will go over the wire.... */
|
/* Don't print stuff or it will go over the wire.... */
|
||||||
_exit(127);
|
_exit(127);
|
||||||
|
@ -120,15 +120,6 @@ static void signal_handler(int signo)
|
|||||||
#undef err
|
#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)
|
static void launch_helper(const char **argv)
|
||||||
{
|
{
|
||||||
// setup vanilla unidirectional pipes interchange
|
// setup vanilla unidirectional pipes interchange
|
||||||
@ -137,7 +128,9 @@ static void launch_helper(const char **argv)
|
|||||||
|
|
||||||
xpipe(pipes);
|
xpipe(pipes);
|
||||||
xpipe(pipes+2);
|
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;
|
idx = (!helper_pid) * 2;
|
||||||
xdup2(pipes[idx], STDIN_FILENO);
|
xdup2(pipes[idx], STDIN_FILENO);
|
||||||
xdup2(pipes[3-idx], STDOUT_FILENO);
|
xdup2(pipes[3-idx], STDOUT_FILENO);
|
||||||
|
@ -4581,7 +4581,7 @@ forkshell(struct job *jp, union node *n, int mode)
|
|||||||
TRACE(("Fork failed, errno=%d", errno));
|
TRACE(("Fork failed, errno=%d", errno));
|
||||||
if (jp)
|
if (jp)
|
||||||
freejob(jp);
|
freejob(jp);
|
||||||
ash_msg_and_raise_error("cannot fork");
|
ash_msg_and_raise_error("can't fork");
|
||||||
}
|
}
|
||||||
if (pid == 0)
|
if (pid == 0)
|
||||||
forkchild(jp, /*n,*/ mode);
|
forkchild(jp, /*n,*/ mode);
|
||||||
|
Loading…
Reference in New Issue
Block a user