isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid installing signal handlers that are io-logger specific. Fixes

Browse Source 
job control when no io logger is enabled.
This commit is contained in:
Todd C. Miller
2010-04-05 16:27:30 -04:00
parent 81819d0c09
commit 2634cf08cc
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/script.c
View File

@@ -369,36 +369,36 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
/* If stdout is not a tty we handle post-processing differently. */ /* If stdout is not a tty we handle post-processing differently. */
ttyout = isatty(STDOUT_FILENO); ttyout = isatty(STDOUT_FILENO);
}
/* Signals to relay from parent to child. */ /* Signals to relay from parent to child. */
sa.sa_flags = 0; /* do not restart syscalls for these */ sa.sa_flags = 0; /* do not restart syscalls for these */
sa.sa_handler = handler; sa.sa_handler = handler;
sigaction(SIGHUP, &sa, NULL); sigaction(SIGHUP, &sa, NULL);
sigaction(SIGTERM, &sa, NULL); sigaction(SIGTERM, &sa, NULL);
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
sigaction(SIGQUIT, &sa, NULL); sigaction(SIGQUIT, &sa, NULL);
sigaction(SIGTSTP, &sa, NULL); sigaction(SIGTSTP, &sa, NULL);
#if 0 /* XXX - keep these? */ #if 0 /* XXX - keep these? */
sigaction(SIGTTIN, &sa, NULL); sigaction(SIGTTIN, &sa, NULL);
sigaction(SIGTTOU, &sa, NULL); sigaction(SIGTTOU, &sa, NULL);
#endif #endif
if (log_io && foreground) { if (foreground) {
/* Copy terminal attrs from user tty -> pty slave. */ /* Copy terminal attrs from user tty -> pty slave. */
if (term_copy(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE], ttyout)) { if (term_copy(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE], ttyout)) {
tty_initialized = 1; tty_initialized = 1;
sync_ttysize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]); sync_ttysize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]);
} }
/* Start out in raw mode is stdout is a tty. */ /* Start out in raw mode is stdout is a tty. */
ttymode = ttyout ? TERM_RAW : TERM_CBREAK; ttymode = ttyout ? TERM_RAW : TERM_CBREAK;
do { do {
n = term_raw(script_fds[SFD_USERTTY], !ttyout, n = term_raw(script_fds[SFD_USERTTY], !ttyout,
ttymode == TERM_CBREAK); ttymode == TERM_CBREAK);
} while (!n && errno == EINTR); } while (!n && errno == EINTR);
if (!n) if (!n)
error(1, "Can't set terminal to raw mode"); error(1, "Can't set terminal to raw mode");
}
} }
/* Set command timeout if specified. */ /* Set command timeout if specified. */
@@ -956,13 +956,13 @@ sigchild(int s)
if (!tq_empty(&io_plugins)) if (!tq_empty(&io_plugins))
flags |= WUNTRACED; flags |= WUNTRACED;
else
recvsig = SIGCHLD;
do { do {
pid = waitpid(child, &child_status, flags); pid = waitpid(child, &child_status, flags);
} while (pid == -1 && errno == EINTR); } while (pid == -1 && errno == EINTR);
if (pid == child) { if (pid == child) {
if (WIFSTOPPED(child_status)) if (tq_empty(&io_plugins))
recvsig = SIGCHLD;
else if (WIFSTOPPED(child_status))
recvsig = WSTOPSIG(child_status); recvsig = WSTOPSIG(child_status);
} }