diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/input.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0f78b8363..c4c197881 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-21 Barton E. Schaefer <schaefer@zsh.org> + + * 31869: Src/input.c: reduce WINCH-twaddling in shingetline() + 2013-10-21 Øystein Walle <oystwa@gmail.com> * 31861: Completion/Unix/Command/_git: _git: Add git-clean diff --git a/Src/input.c b/Src/input.c index 9bd9663bf..4ac7e6ec8 100644 --- a/Src/input.c +++ b/Src/input.c @@ -142,14 +142,14 @@ shingetline(void) char *p; p = buf; + winch_unblock(); for (;;) { - winch_unblock(); do { errno = 0; c = fgetc(bshin); } while (c < 0 && errno == EINTR); - winch_block(); if (c < 0 || c == '\n') { + winch_block(); if (c == '\n') *p++ = '\n'; if (p > buf) { @@ -165,11 +165,13 @@ shingetline(void) } else *p++ = c; if (p >= buf + BUFSIZ - 1) { + winch_block(); line = zrealloc(line, ll + (p - buf) + 1); memcpy(line + ll, buf, p - buf); ll += p - buf; line[ll] = '\0'; p = buf; + winch_unblock(); } } } |