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

Add some more debugging.

Browse Source
This commit is contained in:
Todd C. Miller
2012-02-27 14:42:22 -05:00
parent 28db1fbbed
commit cc97c2e75c
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/exec_pty.c
View File

@@ -446,10 +446,14 @@ perform_io(fd_set *fdsr, fd_set *fdsw, struct command_status *cstat)
/* FALLTHROUGH */ /* FALLTHROUGH */
case 0: case 0:
/* got EOF or pty has gone away */ /* got EOF or pty has gone away */
sudo_debug_printf(SUDO_DEBUG_INFO,
"read EOF from fd %d", iob->rfd);
safe_close(iob->rfd); safe_close(iob->rfd);
iob->rfd = -1; iob->rfd = -1;
break; break;
default: default:
sudo_debug_printf(SUDO_DEBUG_INFO,
"read %d bytes from fd %d", n, iob->rfd);
if (!iob->action(iob->buf + iob->len, n)) if (!iob->action(iob->buf + iob->len, n))
terminate_child(child, true); terminate_child(child, true);
iob->len += n; iob->len += n;
@@ -463,6 +467,9 @@ perform_io(fd_set *fdsr, fd_set *fdsw, struct command_status *cstat)
} while (n == -1 && errno == EINTR); } while (n == -1 && errno == EINTR);
if (n == -1) { if (n == -1) {
if (errno == EPIPE || errno == ENXIO || errno == EBADF) { if (errno == EPIPE || errno == ENXIO || errno == EBADF) {
sudo_debug_printf(SUDO_DEBUG_INFO,
"unable to write %d bytes to fd %d",
iob->len - iob->off, iob->wfd);
/* other end of pipe closed or pty revoked */ /* other end of pipe closed or pty revoked */
if (iob->rfd != -1) { if (iob->rfd != -1) {
safe_close(iob->rfd); safe_close(iob->rfd);
@@ -478,6 +485,8 @@ perform_io(fd_set *fdsr, fd_set *fdsw, struct command_status *cstat)
"error writing fd %d: %s", iob->wfd, strerror(errno)); "error writing fd %d: %s", iob->wfd, strerror(errno));
} }
} else { } else {
sudo_debug_printf(SUDO_DEBUG_INFO,
"wrote %d bytes to fd %d", n, iob->wfd);
iob->off += n; iob->off += n;
} }
} }
@@ -552,6 +561,7 @@ fork_pty(struct command_details *details, int sv[], int *maxfd)
*/ */
memset(io_pipe, 0, sizeof(io_pipe)); memset(io_pipe, 0, sizeof(io_pipe));
if (io_fds[SFD_STDIN] == -1 || !isatty(STDIN_FILENO)) { if (io_fds[SFD_STDIN] == -1 || !isatty(STDIN_FILENO)) {
sudo_debug_printf(SUDO_DEBUG_INFO, "stdin not a tty, creating a pipe");
pipeline = true; 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"));
@@ -560,6 +570,7 @@ fork_pty(struct command_details *details, int sv[], int *maxfd)
io_fds[SFD_STDIN] = io_pipe[STDIN_FILENO][0]; io_fds[SFD_STDIN] = io_pipe[STDIN_FILENO][0];
} }
if (io_fds[SFD_STDOUT] == -1 || !isatty(STDOUT_FILENO)) { if (io_fds[SFD_STDOUT] == -1 || !isatty(STDOUT_FILENO)) {
sudo_debug_printf(SUDO_DEBUG_INFO, "stdout not a tty, creating a pipe");
pipeline = true; 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"));
@@ -568,6 +579,7 @@ fork_pty(struct command_details *details, int sv[], int *maxfd)
io_fds[SFD_STDOUT] = io_pipe[STDOUT_FILENO][1]; io_fds[SFD_STDOUT] = io_pipe[STDOUT_FILENO][1];
} }
if (io_fds[SFD_STDERR] == -1 || !isatty(STDERR_FILENO)) { if (io_fds[SFD_STDERR] == -1 || !isatty(STDERR_FILENO)) {
sudo_debug_printf(SUDO_DEBUG_INFO, "stderr not a tty, creating a pipe");
if (pipe(io_pipe[STDERR_FILENO]) != 0) if (pipe(io_pipe[STDERR_FILENO]) != 0)
error(1, _("unable to create pipe")); error(1, _("unable to create pipe"));
iobufs = io_buf_new(io_pipe[STDERR_FILENO][0], STDERR_FILENO, iobufs = io_buf_new(io_pipe[STDERR_FILENO][0], STDERR_FILENO,