Compare commits

..

No commits in common. "d13793954d310a5491d4efc9f7b2a4b1fe1c9c69" and "d15847dbfe3ae41879776250ddcbdfdfde51a1fc" have entirely different histories.

2 changed files with 8 additions and 11 deletions

View File

@ -1,7 +1,7 @@
#!/usr/bin/bash
#
echo test from script
/usr/bin/dialog --title "This should be one argument" --inputbox "Enter your name:" 0 0
#/usr/bin/dialog --title "This should be one argument" --inputbox "Enter your name:" 0 0

View File

@ -235,11 +235,13 @@ int exec_pty(
byte_count = read(watched_fds[this_fd].fd, buf, BUFFER_SIZE);
if (byte_count == -1) {
if (errno == EAGAIN) { continue; } else {
// error reading from pipe
safe_perror("read", &ttyOrig );
exit(EXIT_FAILURE);
if (errno == EAGAIN) {
// no data to read
continue;
}
// error reading from pipe
safe_perror("read", &ttyOrig );
exit(EXIT_FAILURE);
} else if (byte_count == 0) {
// reached EOF on one of the streams but not a HUP
// we've read all we can this cycle, so go to the next fd in the for loop
@ -266,7 +268,7 @@ int exec_pty(
}
}
if (watched_fds[this_fd].revents & POLLERR) {
//close(watched_fds[this_fd].fd);
close(watched_fds[this_fd].fd);
break_out = true;
//continue;
}
@ -287,11 +289,6 @@ int exec_pty(
// wait for child to exit, capture status
waitpid(pid, &status, 0);
while ((byte_count = read(watched_fds[1].fd, buf, BUFFER_SIZE)) > 0) {
write_all(stdout_log_fh->_fileno, buf, byte_count);
write_all(STDOUT_FILENO, buf, byte_count);
}
while ((byte_count = read(fd_child_stderr_pipe[READ_END], buf, BUFFER_SIZE)) > 0) {
write_all(stderr_log_fh->_fileno, buf, byte_count);
write_all(STDERR_FILENO, buf, byte_count);