1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
commit 2b8bbb5fb0f024ea3917fedbbbaf0fab1c1f6555
Author: Karel Zak <kzak@redhat.com>
Date: Fri Oct 5 12:22:13 2007 +0200
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>
diff --git a/misc-utils/script.c b/misc-utils/script.c
index d3272df..3b957d8 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);
}
/*
|
GitWeb
