diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2022-05-08 05:47:24 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2022-05-08 05:47:24 +0200 |
| commit | 5615b53bbf3578a91bab8658b38d0352433510e7 (patch) | |
| tree | bdf29751a810afd43ab7497d47229ba64d5707e8 /Src/input.c | |
| parent | 514524ee7be382a740e53e2a7c0247f2d68d7730 (diff) | |
| parent | 9529af723604dfe1c8152db11e1d216621c898d5 (diff) | |
| download | zsh-5615b53bbf3578a91bab8658b38d0352433510e7.tar.gz zsh-5615b53bbf3578a91bab8658b38d0352433510e7.zip | |
Update upstream source from tag 'upstream/5.8.1.3-test'
Update to upstream version '5.8.1.3-test'
with Debian dir db59cf6a81e7a92e349f815dc21759ccb7ed689a
Diffstat (limited to 'Src/input.c')
| -rw-r--r-- | Src/input.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/Src/input.c b/Src/input.c index c59232681..9898a7177 100644 --- a/Src/input.c +++ b/Src/input.c @@ -217,12 +217,34 @@ shinbufrestore(void) static int shingetchar(void) { - int nread; + int nread, rsize = isset(SHINSTDIN) ? 1 : SHINBUFSIZE; if (shinbufptr < shinbufendptr) return STOUC(*shinbufptr++); shinbufreset(); +#ifdef USE_LSEEK + if (rsize == 1 && lseek(SHIN, 0, SEEK_CUR) != (off_t)-1) + rsize = SHINBUFSIZE; + if (rsize > 1) { + do { + errno = 0; + nread = read(SHIN, shinbuffer, rsize); + } while (nread < 0 && errno == EINTR); + if (nread <= 0) + return -1; + if (isset(SHINSTDIN) && + (shinbufendptr = memchr(shinbuffer, '\n', nread))) { + shinbufendptr++; + rsize = (shinbufendptr - shinbuffer); + if (nread > rsize && + lseek(SHIN, -(nread - rsize), SEEK_CUR) < 0) + zerr("lseek(%d, %d): %e", SHIN, -(nread - rsize), errno); + } else + shinbufendptr = shinbuffer + nread; + return STOUC(*shinbufptr++); + } +#endif for (;;) { errno = 0; nread = read(SHIN, shinbufendptr, 1); |