emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less: fix newly-introduced case of less spinning forever

Browse Source 
on pty's closed etc
This commit is contained in:
Denis Vlasenko 2008-10-31 03:04:55 +00:00
parent 028eab61bc
commit 64974793b9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
miscutils/less.c
View File

@ -853,12 +853,16 @@ static ssize_t getch_nowait(void)
/* We have kbd_fd in O_NONBLOCK mode, read inside read_key() /* We have kbd_fd in O_NONBLOCK mode, read inside read_key()
* would not block even if there is no input available */ * would not block even if there is no input available */
rd = read_key(kbd_fd, NULL, input); rd = read_key(kbd_fd, NULL, input);
if (rd == -1 && errno == EAGAIN) { if (rd == -1) {
/* No keyboard input available. Since poll() did return, if (errno == EAGAIN) {
* we should have input on stdin */ /* No keyboard input available. Since poll() did return,
read_lines(); * we should have input on stdin */
buffer_fill_and_print(); read_lines();
goto again; buffer_fill_and_print();
goto again;
}
/* EOF/error (ssh session got killed etc) */
less_exit(0);
} }
set_tty_cooked(); set_tty_cooked();
return rd; return rd;