diff options
| author | Karel Zak <kzak@redhat.com> | 2007-10-05 12:22:13 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2007-10-05 12:39:19 +0200 |
| commit | 2b8bbb5fb0f024ea3917fedbbbaf0fab1c1f6555 (patch) | |
| tree | 8cdd1bc4c63d9b835918099fe6e64ad6d601c91b | |
| parent | f92dc20fcb9bb9f15ac95e0e3d6ae96ecfb59619 (diff) | |
| download | util-linux-old-2b8bbb5fb0f024ea3917fedbbbaf0fab1c1f6555.tar.gz | |
script: dies on SIGWINCH
The "doinput" process doesn't make a difference between SIGWINCH and
SIGCHILD. This process also sends unnecessary SIGWINCH to child (the
signal is ignored by child). Fixed.
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | misc-utils/script.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/misc-utils/script.c b/misc-utils/script.c index d3272df5..3b957d8d 100644 --- a/misc-utils/script.c +++ b/misc-utils/script.c @@ -99,6 +99,7 @@ int tflg = 0; static char *progname; int die; +int resized; static void die_if_link(char *fn) { @@ -235,8 +236,14 @@ doinput() { if (die == 0 && child && kill(child, 0) == -1 && errno == ESRCH) die = 1; - while (die == 0 && (cc = read(0, ibuf, BUFSIZ)) > 0) - (void) write(master, ibuf, cc); + while (die == 0) { + if ((cc = read(0, ibuf, BUFSIZ)) > 0) + (void) write(master, ibuf, cc); + else if (cc == -1 && errno == EINTR && resized) + resized = 0; + else + break; + } done(); } @@ -255,11 +262,10 @@ finish(int dummy) { void resize(int dummy) { + resized = 1; /* transmit window change information to the child */ (void) ioctl(0, TIOCGWINSZ, (char *)&win); (void) ioctl(slave, TIOCSWINSZ, (char *)&win); - - kill(child, SIGWINCH); } /* |