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

Fix running commands that need the terminal in the background when

Browse Source 
I/O logging is enabled.  E.g. "sudo vi &".  When the command is
foregrounded, it will now resume properly.
This commit is contained in:
Todd C. Miller
2012-09-24 15:06:14 -04:00
parent 6a25affb47
commit 0e94e8ca91
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/exec_pty.c
View File

@@ -93,7 +93,7 @@ static char slavename[PATH_MAX];
static bool foreground, pipeline, tty_initialized; static bool foreground, pipeline, tty_initialized;
static int io_fds[6] = { -1, -1, -1, -1, -1, -1}; static int io_fds[6] = { -1, -1, -1, -1, -1, -1};
static int ttymode = TERM_COOKED; static int ttymode = TERM_COOKED;
static pid_t ppgrp, cmnd_pgrp; static pid_t ppgrp, cmnd_pgrp, mon_pgrp;
static sigset_t ttyblock; static sigset_t ttyblock;
static struct io_buffer *iobufs; static struct io_buffer *iobufs;
@@ -850,7 +850,7 @@ deliver_signal(pid_t pid, int signo, bool from_parent)
case SIGCONT_BG: case SIGCONT_BG:
/* Continue in background, I take controlling tty. */ /* Continue in background, I take controlling tty. */
do { do {
status = tcsetpgrp(io_fds[SFD_SLAVE], getpid()); status = tcsetpgrp(io_fds[SFD_SLAVE], mon_pgrp);
} while (status == -1 && errno == EINTR); } while (status == -1 && errno == EINTR);
killpg(pid, SIGCONT); killpg(pid, SIGCONT);
break; break;
@@ -920,9 +920,12 @@ handle_sigchld(int backchannel, struct command_status *cstat)
snprintf(signame, sizeof(signame), "%d", WSTOPSIG(status)); snprintf(signame, sizeof(signame), "%d", WSTOPSIG(status));
sudo_debug_printf(SUDO_DEBUG_INFO, sudo_debug_printf(SUDO_DEBUG_INFO,
"command stopped, SIG%s", signame); "command stopped, SIG%s", signame);
/* Saved the foreground pgid so we can restore it later. */
do { do {
cmnd_pgrp = tcgetpgrp(io_fds[SFD_SLAVE]); pid = tcgetpgrp(io_fds[SFD_SLAVE]);
} while (cmnd_pgrp == -1 && errno == EINTR); } while (pid == -1 && errno == EINTR);
if (pid != mon_pgrp)
cmnd_pgrp = pid;
if (send_status(backchannel, cstat) == -1) if (send_status(backchannel, cstat) == -1)
return alive; /* XXX */ return alive; /* XXX */
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
@@ -955,7 +958,7 @@ exec_monitor(struct command_details *details, int backchannel)
struct timeval tv; struct timeval tv;
fd_set *fdsr; fd_set *fdsr;
sigaction_t sa; sigaction_t sa;
int errpipe[2], maxfd, n, status; int errpipe[2], maxfd, n;
bool alive = true; bool alive = true;
unsigned char signo; unsigned char signo;
debug_decl(exec_monitor, SUDO_DEBUG_EXEC); debug_decl(exec_monitor, SUDO_DEBUG_EXEC);
@@ -1032,6 +1035,8 @@ exec_monitor(struct command_details *details, int backchannel)
#endif #endif
} }
mon_pgrp = getpgrp(); /* save a copy of our process group */
/* /*
* If stdin/stdout is not a tty, start command in the background * If stdin/stdout is not a tty, start command in the background
* since 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.
@@ -1088,8 +1093,8 @@ exec_monitor(struct command_details *details, int backchannel)
setpgid(cmnd_pid, cmnd_pgrp); setpgid(cmnd_pid, cmnd_pgrp);
if (foreground) { if (foreground) {
do { do {
status = tcsetpgrp(io_fds[SFD_SLAVE], cmnd_pgrp); n = tcsetpgrp(io_fds[SFD_SLAVE], cmnd_pgrp);
} while (status == -1 && errno == EINTR); } while (n == -1 && errno == EINTR);
} }
/* Wait for errno on pipe, signal on backchannel or for SIGCHLD */ /* Wait for errno on pipe, signal on backchannel or for SIGCHLD */