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

Make iobufs private to exec_iolog.c.

Browse Source
This commit is contained in:
Todd C. Miller
2023-03-24 15:26:37 -06:00
parent ee3f99c88c
commit 8d2b9a4343
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/exec_pty.c
View File

@@ -1160,12 +1160,12 @@ exec_pty(struct command_details *details, struct command_status *cstat)
/* Read from /dev/tty, write to pty leader */
if (!ISSET(details->flags, CD_BACKGROUND)) {
io_buf_new(io_fds[SFD_USERTTY], io_fds[SFD_LEADER],
log_ttyin, read_callback, write_callback, &ec, &iobufs);
log_ttyin, read_callback, write_callback, &ec);
}
/* Read from pty leader, write to /dev/tty */
io_buf_new(io_fds[SFD_LEADER], io_fds[SFD_USERTTY],
log_ttyout, read_callback, write_callback, &ec, &iobufs);
log_ttyout, read_callback, write_callback, &ec);
/* Are we the foreground process? */
ec.foreground = tcgetpgrp(io_fds[SFD_USERTTY]) == ppgrp;
@@ -1194,7 +1194,7 @@ exec_pty(struct command_details *details, struct command_status *cstat)
if (pipe2(io_pipe[STDIN_FILENO], O_CLOEXEC) != 0)
sudo_fatal("%s", U_("unable to create pipe"));
io_buf_new(STDIN_FILENO, io_pipe[STDIN_FILENO][1],
log_stdin, read_callback, write_callback, &ec, &iobufs);
log_stdin, read_callback, write_callback, &ec);
io_fds[SFD_STDIN] = io_pipe[STDIN_FILENO][0];
}
@@ -1225,7 +1225,7 @@ exec_pty(struct command_details *details, struct command_status *cstat)
if (pipe2(io_pipe[STDOUT_FILENO], O_CLOEXEC) != 0)
sudo_fatal("%s", U_("unable to create pipe"));
io_buf_new(io_pipe[STDOUT_FILENO][0], STDOUT_FILENO,
log_stdout, read_callback, write_callback, &ec, &iobufs);
log_stdout, read_callback, write_callback, &ec);
io_fds[SFD_STDOUT] = io_pipe[STDOUT_FILENO][1];
}
}
@@ -1245,7 +1245,7 @@ exec_pty(struct command_details *details, struct command_status *cstat)
if (pipe2(io_pipe[STDERR_FILENO], O_CLOEXEC) != 0)
sudo_fatal("%s", U_("unable to create pipe"));
io_buf_new(io_pipe[STDERR_FILENO][0], STDERR_FILENO,
log_stderr, read_callback, write_callback, &ec, &iobufs);
log_stderr, read_callback, write_callback, &ec);
io_fds[SFD_STDERR] = io_pipe[STDERR_FILENO][1];
}
}