diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-01-25 16:07:49 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-01-25 16:07:49 -0800 |
| commit | 494c251cb0b0af70ac940b42df1d6c9940e469c8 (patch) | |
| tree | ae7a72c91b32f97e03332e11e8078392f930399b | |
| parent | 2546c86244ec2bb458580a90a0a5e0648220ad9a (diff) | |
| download | zsh-494c251cb0b0af70ac940b42df1d6c9940e469c8.tar.gz zsh-494c251cb0b0af70ac940b42df1d6c9940e469c8.tar.xz zsh-494c251cb0b0af70ac940b42df1d6c9940e469c8.zip | |
34399: fix polltty thinko from 34365
Also add missing ChangeLog entry for 34365.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/utils.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index abc381f91..191d6a9e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-01-25 Barton E. Schaefer <schaefer@zsh.org> + * 34399: Src/utils.c: fix polltty thinko from 34365 + * 34389: Src/hist.c: fix parsing of ">!" when read from histfile with HIST_LEX_WORDS in effect @@ -7,6 +9,10 @@ * 34369: Daniel Shahaf: document error / warning codes. + * 34365: configure.ac, Src/hist.c, Src/utils.c: History lockfile + backoff: randomised time. zsleep() provides microsecond + resolution for sleep. + * 34383: Src/utils.c: new ztrdup() shoud be dupstring(). 2015-01-25 Oliver Kiddle <opk@zsh.org> diff --git a/Src/utils.c b/Src/utils.c index 45f596a42..d38babbe4 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2323,7 +2323,7 @@ read_poll(int fd, int *readchar, int polltty, zlong microseconds) * as plausible as it sounds, but it seems the right way to guess. * pws 2000/06/26 */ - if (fd >= 0) { + if (polltty && fd >= 0) { gettyinfo(&ti); if ((polltty = ti.tio.c_cc[VMIN])) { ti.tio.c_cc[VMIN] = 0; |