X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Fshgetc.c;h=e878b00ad50ac709b33366f11619817c1e535636;hp=7c4e58c1e7579effa325ef1e3c0ec5eabbed7fb5;hb=c20804500deebaabc56f383d48dd1ac77dce8349;hpb=2162541f38d3f642f5a643010548d62220d55a4d

diff --git a/src/internal/shgetc.c b/src/internal/shgetc.c
index 7c4e58c1..e878b00a 100644
--- a/src/internal/shgetc.c
+++ b/src/internal/shgetc.c
@@ -3,8 +3,8 @@
 void __shlim(FILE *f, off_t lim)
 {
 	f->shlim = lim;
-	f->shcnt = f->rend ? f->rend - f->buf : 0;
-	if (lim && f->rend - f->rpos > lim)
+	f->shcnt = f->rend - f->rpos;
+	if (lim && f->shcnt > lim)
 		f->shend = f->rpos + lim;
 	else
 		f->shend = f->rend;
@@ -13,12 +13,15 @@ void __shlim(FILE *f, off_t lim)
 int __shgetc(FILE *f)
 {
 	int c;
-	if (f->shcnt >= f->shlim) return EOF;
-	c = __uflow(f);
+	if (f->shlim && f->shcnt >= f->shlim || (c=__uflow(f)) < 0) {
+		f->shend = 0;
+		return EOF;
+	}
 	if (f->shlim && f->rend - f->rpos > f->shlim - f->shcnt - 1)
 		f->shend = f->rpos + (f->shlim - f->shcnt - 1);
 	else
 		f->shend = f->rend;
-	if (f->rend) f->shcnt += f->rend - f->buf;
+	if (f->rend) f->shcnt += f->rend - f->rpos + 1;
+	if (f->rpos[-1] != c) f->rpos[-1] = c;
 	return c;
 }