X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstdio%2F__stdio_read.c;h=ea675da34abbfd4f34edcd042314b8fb93cf9426;hb=29e4319178cbc2a4e9f058a99ae8098d4b6ac055;hp=a2e4cd62fe9f35dbae98d1ade1fec32d7fe4ebf1;hpb=e3cd6c5c265cd481db6e0c5b529855d99f0bda30;p=musl

diff --git a/src/stdio/__stdio_read.c b/src/stdio/__stdio_read.c
index a2e4cd62..ea675da3 100644
--- a/src/stdio/__stdio_read.c
+++ b/src/stdio/__stdio_read.c
@@ -1,22 +1,24 @@
 #include "stdio_impl.h"
+#include <sys/uio.h>
 
 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;
 
-	cnt = syscall(SYS_readv, f->fd, iov, 2);
+	cnt = iov[0].iov_len ? syscall(SYS_readv, f->fd, iov, 2)
+		: syscall(SYS_read, f->fd, iov[1].iov_base, iov[1].iov_len);
 	if (cnt <= 0) {
-		f->flags |= F_EOF ^ ((F_ERR^F_EOF) & cnt);
-		f->rpos = f->rend = 0;
-		return cnt;
+		f->flags |= cnt ? F_ERR : F_EOF;
+		return 0;
 	}
-	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;
 }