diff options
| -rw-r--r-- | usr.bin/tip/tip/tip.c | 12 | ||||
| -rw-r--r-- | usr.bin/tip/tip/tipout.c | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c index 2b11d0b..1f910e5 100644 --- a/usr.bin/tip/tip/tip.c +++ b/usr.bin/tip/tip/tip.c @@ -81,6 +81,7 @@ int disc = OTTYDISC; /* tip normally runs this way */ void intprompt(); void timeout(); +void killchild(); void cleanup(); void tipdone(); char *sname(); @@ -286,6 +287,15 @@ usage() } void +killchild() +{ + if (pid != 0) { + kill(pid, SIGTERM); + pid = 0; + } +} + +void cleanup() { @@ -427,6 +437,8 @@ tipin() int i; char gch, bol = 1; + atexit(killchild); + /* * Kinda klugey here... * check for scripting being turned on from the .tiprc file, diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c index de1fe6a..67932f6 100644 --- a/usr.bin/tip/tip/tipout.c +++ b/usr.bin/tip/tip/tipout.c @@ -160,7 +160,8 @@ tipout() omask = sigblock(ALLSIGS); for (cp = buf; cp < buf + cnt; cp++) *cp &= 0177; - write(1, buf, cnt); + if (write(1, buf, cnt) < 0) + exit(1); if (boolean(value(SCRIPT)) && fscript != NULL) { if (!boolean(value(BEAUTIFY))) { fwrite(buf, 1, cnt, fscript); |
