X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2F__stdio_read.c;fp=src%2Fstdio%2F__stdio_read.c;h=218bd88d18df42d908dc121600af2cf242cb9abd;hb=2cff36a84f268c09f4c9dc5a1340652c8e298dc0;hp=a2e4cd62fe9f35dbae98d1ade1fec32d7fe4ebf1;hpb=67e793e5e14fe031569117fd88328268e67ad4ee;p=musl

diff --git a/src/stdio/__stdio_read.c b/src/stdio/__stdio_read.c
index a2e4cd62..218bd88d 100644
--- a/src/stdio/__stdio_read.c
+++ b/src/stdio/__stdio_read.c
@@ -3,7 +3,7 @@
 size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
 {
 	struct iovec iov[2] = {
-		{ .iov_base = buf, .iov_len = len },
+		{ .iov_base = buf, .iov_len = len - !!f->buf_size },
 		{ .iov_base = f->buf, .iov_len = f->buf_size }
 	};
 	ssize_t cnt;
@@ -14,9 +14,10 @@ size_t __stdio_read(FILE *f, unsigned char *buf, size_t len)
 		f->rpos = f->rend = 0;
 		return cnt;
 	}
-	if (cnt <= len) return cnt;
-	cnt -= len;
+	if (cnt <= iov[0].iov_len) return cnt;
+	cnt -= iov[0].iov_len;
 	f->rpos = f->buf;
 	f->rend = f->buf + cnt;
+	if (f->buf_size) buf[len-1] = *f->rpos++;
 	return len;
 }