From f92804188eb464536d638548e51e835b6c49e373 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 24 Feb 2018 10:51:16 -0500 Subject: consistently return number of bytes read from stdio read backend the stdio FILE read backend's return type is size_t, not ssize_t, and all of the special (non-fd-backed) FILE types already return the number of bytes read (zero) on error or eof. only __stdio_read leaked a syscall error return into its return value. fread had a workaround for this behavior going all the way back to the original check-in. remove the workaround since it's no longer needed. --- src/stdio/fread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/stdio/fread.c') diff --git a/src/stdio/fread.c b/src/stdio/fread.c index aef75f73..733d3716 100644 --- a/src/stdio/fread.c +++ b/src/stdio/fread.c @@ -25,7 +25,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f) /* Read the remainder directly */ for (; l; l-=k, dest+=k) { k = __toread(f) ? 0 : f->read(f, dest, l); - if (k+1<=1) { + if (!k) { FUNLOCK(f); return (len-l)/size; } -- cgit v1.2.1