summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorcperciva <cperciva@FreeBSD.org>2004-01-27 17:50:47 +0000
committercperciva <cperciva@FreeBSD.org>2004-01-27 17:50:47 +0000
commit01e7ffe1468e224ba77b380a8a5de9db1534e644 (patch)
tree780d9930d29f065d96f875ee914a457c8adb0bef /usr.bin
parent8908e99bdb9894b345f7bf290d8ecba0a3c49e94 (diff)
downloadFreeBSD-src-01e7ffe1468e224ba77b380a8a5de9db1534e644.zip
FreeBSD-src-01e7ffe1468e224ba77b380a8a5de9db1534e644.tar.gz
Back out part of 1.21, since it breaks `script interactive-program`. This
re-breaks non-interactive portupgrade (or at least old versions of portupgrade); I'll see if I can put together a solution which avoids breaking anything later. Approved by: rwatson (mentor) Noticed by: Stefan Farfeleder, Joshua Goodall
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/script/script.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index a00cdf2..48f026b 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -168,8 +168,7 @@ main(int argc, char *argv[])
FD_ZERO(&rfd);
for (;;) {
FD_SET(master, &rfd);
- if (argv[0] == NULL)
- FD_SET(STDIN_FILENO, &rfd);
+ FD_SET(STDIN_FILENO, &rfd);
if (flushtime > 0) {
tv.tv_sec = flushtime;
tv.tv_usec = 0;
OpenPOWER on IntegriCloud