diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2000-11-08 17:09:15 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2000-11-08 17:09:15 +0000 |
| commit | 0ce5e0f3038bfb2cf7e584cd26bbb417dc0ec10c (patch) | |
| tree | 6f3d5f54435b19fea389cf5352c6be3f98abad4f | |
| parent | 468e3b59dc47fee6822e74bbed612c1cc1192b8b (diff) | |
| download | zsh-0ce5e0f3038bfb2cf7e584cd26bbb417dc0ec10c.tar.gz zsh-0ce5e0f3038bfb2cf7e584cd26bbb417dc0ec10c.tar.xz zsh-0ce5e0f3038bfb2cf7e584cd26bbb417dc0ec10c.zip | |
Try blocking read() in read_poll() only if select() returns error (or
doesn't exist).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/utils.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4299bcf33..c4840b056 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-11-08 Bart Schaefer <schaefer@zsh.org> + + * 13140: Src/utils.c: Believe the non-error not-ready return value + from select(), in read_poll(). + 2000-11-08 Sven Wischnowsky <wischnow@zsh.org> * ?????: Src/Modules/zpty.c: use possible read character from diff --git a/Src/utils.c b/Src/utils.c index 686a46fbf..b7b8d1295 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -1373,7 +1373,7 @@ read_poll(int fd, int *readchar, int polltty) #endif #endif - if (ret <= 0) { + if (ret < 0) { /* * Final attempt: set non-blocking read and try to read a character. * Praise Bill, this works under Cygwin (nothing else seems to). |