mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-25 17:41:19 +02:00
21603: Make read_poll more interruptible.
If we interrupted the first read we still did the fallback read. This is wrong.
This commit is contained in:
parent
770500d69d
commit
8cf68f05ab
2 changed files with 6 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
|||
2016-06-02 Peter Stephenson <p.stephenson@samsung.com>
|
||||
|
||||
* users/21603: Src/utils.c: Don't do second attempt at read/poll
|
||||
from terminal if interrupted.
|
||||
|
||||
2016-05-22 Peter Stephenson <p.w.stephenson@ntlworld.com>
|
||||
|
||||
* 38515: Matthew Martin: Completion/Zsh/Context/_subscript:
|
||||
|
|
|
@ -2534,7 +2534,7 @@ read_poll(int fd, int *readchar, int polltty, zlong microseconds)
|
|||
#endif
|
||||
#endif
|
||||
|
||||
if (fd >= 0 && ret < 0) {
|
||||
if (fd >= 0 && ret < 0 && !errflag) {
|
||||
/*
|
||||
* Final attempt: set non-blocking read and try to read a character.
|
||||
* Praise Bill, this works under Cygwin (nothing else seems to).
|
||||
|
|
Loading…
Reference in a new issue