fix broken shgetc limiter logic (wasn't working)

[musl] / src / internal / shgetc.c

diff --git a/src/internal/shgetc.c b/src/internal/shgetc.c
index 7c4e58c..e85d38a 100644 (file)
--- a/src/internal/shgetc.c
+++ b/src/internal/shgetc.c
@@ -3,7 +3,7 @@
 void __shlim(FILE *f, off_t lim)
 {
        f->shlim = lim;
-       f->shcnt = f->rend ? f->rend - f->buf : 0;
+       f->shcnt = f->rend - f->rpos;
        if (lim && f->rend - f->rpos > lim)
                f->shend = f->rpos + lim;
        else
@@ -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);