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

Also start the command in the background if stdin is not a tty.

Browse Source
This commit is contained in:
Todd C. Miller
2010-05-11 08:12:02 -04:00
parent c2d0888bf9
commit 02f8c187a5
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/script.c
View File

@@ -107,7 +107,7 @@ struct io_buffer {
}; };
static int script_fds[6] = { -1, -1, -1, -1, -1, -1}; static int script_fds[6] = { -1, -1, -1, -1, -1, -1};
static int ttyin = TRUE; static int pipeline = FALSE;
static sig_atomic_t recvsig[NSIG]; static sig_atomic_t recvsig[NSIG];
static sig_atomic_t ttymode = TERM_COOKED; static sig_atomic_t ttymode = TERM_COOKED;
@@ -563,7 +563,7 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
*/ */
memset(io_pipe, 0, sizeof(io_pipe)); memset(io_pipe, 0, sizeof(io_pipe));
if (!isatty(STDIN_FILENO)) { if (!isatty(STDIN_FILENO)) {
ttyin = FALSE; pipeline = TRUE;
if (pipe(io_pipe[STDIN_FILENO]) != 0) if (pipe(io_pipe[STDIN_FILENO]) != 0)
error(1, "unable to create pipe"); error(1, "unable to create pipe");
iobufs = io_buf_new(STDIN_FILENO, io_pipe[STDIN_FILENO][1], iobufs = io_buf_new(STDIN_FILENO, io_pipe[STDIN_FILENO][1],
@@ -571,6 +571,7 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
script_fds[SFD_STDIN] = io_pipe[STDIN_FILENO][0]; script_fds[SFD_STDIN] = io_pipe[STDIN_FILENO][0];
} }
if (!isatty(STDOUT_FILENO)) { if (!isatty(STDOUT_FILENO)) {
pipeline = TRUE;
if (pipe(io_pipe[STDOUT_FILENO]) != 0) if (pipe(io_pipe[STDOUT_FILENO]) != 0)
error(1, "unable to create pipe"); error(1, "unable to create pipe");
iobufs = io_buf_new(io_pipe[STDOUT_FILENO][0], STDOUT_FILENO, iobufs = io_buf_new(io_pipe[STDOUT_FILENO][0], STDOUT_FILENO,
@@ -601,8 +602,8 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
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 stdin is a tty. */ /* Start out in raw mode if we are not part of a pipeline. */
if (ttyin) { if (!pipeline) {
ttymode = TERM_RAW; ttymode = TERM_RAW;
do { do {
n = term_raw(script_fds[SFD_USERTTY], 0); n = term_raw(script_fds[SFD_USERTTY], 0);
@@ -971,12 +972,12 @@ script_child(const char *path, char *argv[], char *envp[], int backchannel, int
#endif #endif
/* /*
* If stdin is not a tty, start command in the background since * If stdin/stdout is not a tty, start command in the background
* it might be part of a pipeline that reads from /dev/tty. * since it might be part of a pipeline that reads from /dev/tty.
* In this case, we rely on the command receiving SIGTTOU or SIGTTIN * In this case, we rely on the command receiving SIGTTOU or SIGTTIN
* when it needs access to the controlling tty. * when it needs access to the controlling tty.
*/ */
if (foreground && !ttyin) if (pipeline)
foreground = 0; foreground = 0;
/* Start command and wait for it to stop or exit */ /* Start command and wait for it to stop or exit */