ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

script: don't wait for empty descriptors if child is dead 

The current code waits for empty file master and slave descriptors,
but it makes sense only if there is child process that cares (read)
about data in the descriptors.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-01-16 12:22:13 +01:00
parent c62f164cf1
commit 38374be4c8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
term-utils/script.c
View File

@ -302,11 +302,12 @@ static void wait_for_empty_fd(int fd)
{ .fd = fd, .events = POLLIN }
};
while (poll(fds, 1, 50) == 1);
while (die == 0 && poll(fds, 1, 100) == 1);
}
void
doinput(void) {
int errsv = 0;
ssize_t cc = 0;
char ibuf[BUFSIZ];
@ -330,15 +331,17 @@ doinput(void) {
}
resized = 0;
} else
} else {
errsv = errno;
break;
}
}
/* To be sure that we don't miss any data */
wait_for_empty_fd(slave);
wait_for_empty_fd(master);
if (cc == 0 && errno == 0) {
if (die == 0 && cc == 0 && errsv == 0) {
/*
* Forward EOF from stdin (detected by read() above) to slave
* (shell) to correctly terminate the session. It seems we have
@ -360,7 +363,8 @@ doinput(void) {
wait_for_empty_fd(master);
}
finish(0); /* wait for childern */
if (!die)
finish(0); /* wait for childern */
done();
}