From f007bb854b0b2d2d12cd45a8feb674fa9abe70b2 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 16 Apr 2012 01:55:37 -0400 Subject: [PATCH] fix broken shgetc limiter logic (wasn't working) --- src/internal/shgetc.c | 5 ++++- src/internal/shgetc.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/internal/shgetc.c b/src/internal/shgetc.c index 82e3a4fa..e85d38ac 100644 --- a/src/internal/shgetc.c +++ b/src/internal/shgetc.c @@ -13,7 +13,10 @@ void __shlim(FILE *f, off_t lim) int __shgetc(FILE *f) { int c; - if (f->shcnt >= f->shlim) return EOF; + if (f->shlim && f->shcnt >= f->shlim) { + f->shend = 0; + return EOF; + } c = __uflow(f); if (f->shlim && f->rend - f->rpos > f->shlim - f->shcnt - 1) f->shend = f->rpos + (f->shlim - f->shcnt - 1); diff --git a/src/internal/shgetc.h b/src/internal/shgetc.h index 0543cb0d..7beb8ce6 100644 --- a/src/internal/shgetc.h +++ b/src/internal/shgetc.h @@ -6,4 +6,4 @@ int __shgetc(FILE *); #define shcnt(f) ((f)->shcnt + ((f)->rpos - (f)->rend)) #define shlim(f, lim) __shlim((f), (lim)) #define shgetc(f) (((f)->rpos < (f)->shend) ? *(f)->rpos++ : __shgetc(f)) -#define shunget(f) ((f)->rend ? (void)(f)->rpos-- : (void)0) +#define shunget(f) ((f)->shend ? (void)(f)->rpos-- : (void)0) -- 2.25.1