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

Back out WIP code that was mistakenly committed.

Browse Source
This commit is contained in:
Todd C. Miller
2020-06-01 14:04:15 -06:00
parent a0aaae5541
commit de31e6d53b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/exec_pty.c
View File

@@ -110,7 +110,7 @@ static void del_io_events(bool nonblocking);
static void sync_ttysize(struct exec_closure_pty *ec); static void sync_ttysize(struct exec_closure_pty *ec);
static int safe_close(int fd); static int safe_close(int fd);
static void ev_free_by_fd(struct sudo_event_base *evbase, int fd); static void ev_free_by_fd(struct sudo_event_base *evbase, int fd);
static pid_t check_foreground(struct exec_closure_pty *ec); static void check_foreground(struct exec_closure_pty *ec);
static void add_io_events(struct sudo_event_base *evbase); static void add_io_events(struct sudo_event_base *evbase);
static void schedule_signal(struct exec_closure_pty *ec, int signo); static void schedule_signal(struct exec_closure_pty *ec, int signo);
@@ -487,25 +487,22 @@ log_winchange(unsigned int rows, unsigned int cols)
/* /*
* Check whether we are running in the foregroup. * Check whether we are running in the foregroup.
* Updates the foreground global and updates the window size. * Updates the foreground global and does lazy init of the
* Returns 0 if there is no tty, the foreground process group ID * the pty slave as needed.
* on success, or -1 on failure (tty revoked).
*/ */
static pid_t static void
check_foreground(struct exec_closure_pty *ec) check_foreground(struct exec_closure_pty *ec)
{ {
int ret = 0;
debug_decl(check_foreground, SUDO_DEBUG_EXEC); debug_decl(check_foreground, SUDO_DEBUG_EXEC);
if (io_fds[SFD_USERTTY] != -1) { if (io_fds[SFD_USERTTY] != -1) {
if ((ret = tcgetpgrp(io_fds[SFD_USERTTY])) != -1) { foreground = tcgetpgrp(io_fds[SFD_USERTTY]) == ec->ppgrp;
foreground = ret == ec->ppgrp;
/* Also check for window size changes. */ /* Also check for window size changes. */
sync_ttysize(ec); sync_ttysize(ec);
} }
}
debug_return_int(ret); debug_return;
} }
/* /*
@@ -571,7 +568,6 @@ suspend_sudo(struct exec_closure_pty *ec, int signo)
log_suspend(SIGCONT); log_suspend(SIGCONT);
/* Check foreground/background status on resume. */ /* Check foreground/background status on resume. */
/* XXX - handle missing tty */
check_foreground(ec); check_foreground(ec);
/* /*