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

vi: survive if stdin is nonblocking. closes 9851

Browse Source 
function                                             old     new   delta
readit                                                55      69     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-05-02 20:39:02 +02:00
parent a1a3b595e1
commit 0cc9b1843d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editors/vi.c
View File

@ -2816,8 +2816,15 @@ static int readit(void) // read (maybe cursor) key from stdin
int c; int c;
fflush_all(); fflush_all();
c = read_key(STDIN_FILENO, readbuffer, /*timeout off:*/ -2);
// Wait for input. TIMEOUT = -1 makes read_key wait even
// on nonblocking stdin.
// Note: read_key sets errno to 0 on success.
again:
c = read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1);
if (c == -1) { // EOF/error if (c == -1) { // EOF/error
if (errno == EAGAIN) // paranoia
goto again;
go_bottom_and_clear_to_eol(); go_bottom_and_clear_to_eol();
cookmode(); // terminal to "cooked" cookmode(); // terminal to "cooked"
bb_error_msg_and_die("can't read user input"); bb_error_msg_and_die("can't read user input");