d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve hack from previous commit to this file: exit if we get successive

Browse Source 
EOFs from reading stderr (eg. not from argv[1]).
This commit is contained in:
hoek 2000-05-12 04:04:27 +00:00
parent bce7108af6
commit 9a84256d1d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/more/os.c
View File

@ -184,11 +184,21 @@ iread(fd, buf, len)
flush();
reading = 1;
n = read(fd, buf, len);
/* There's really no terribly impressive reason why we should just
* sighup after a single EOF read, nor is there any particular
* reason why we SIGHUP ourselves rather than calling exit(). However,
* none of it hurts, either. */
if (n == 0) neofs++;
/*
* XXX This is a hack. We do want to exit if we read a couple EOFs
* from the terminal (to avoid spinning on input if the user
* leaves us hanging), but we should be comparing against the
* tty variable from ttyin.c.
*
* We wait for two successive EOFs just to give any potential
* oddities the benefit of the doubt.
*/
if (fd == 2) {
if (n == 0)
neofs++;
else
neofs = 0;
}
if (neofs > 2) kill(getpid(), SIGHUP);
reading = 0;