SILO-GROUP
/
rex
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Activity

possible fix for buffering issue

master
phanes 2024-02-08 15:04:52 -05:00
parent d15847dbfe
commit e9fd8c80bc
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sample/components/independent_test_1.bash
View File

@ -1,7 +1,7 @@
#!/usr/bin/bash #!/usr/bin/bash
# #
echo test from script 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

11
src/lcpex/vpty/libclpex_tty.cpp
View File

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