fix dup3 ignoring all flags but O_CLOEXEC on archs with SYS_dup2 syscall

[musl] / src / stdio / fread.c

diff --git a/src/stdio/fread.c b/src/stdio/fread.c
index 8105fe9..a2116da 100644 (file)
--- a/src/stdio/fread.c
+++ b/src/stdio/fread.c
@@ -1,18 +1,19 @@
 #include "stdio_impl.h"
+#include <string.h>
 
 #define MIN(a,b) ((a)<(b) ? (a) : (b))
 
-size_t fread(void *destv, size_t size, size_t nmemb, FILE *f)
+size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f)
 {
        unsigned char *dest = destv;
        size_t len = size*nmemb, l = len, k;
-
-       /* Never touch the file if length is zero.. */
-       if (!l) return 0;
+       if (!size) nmemb = 0;
 
        FLOCK(f);
 
-       if (f->rend - f->rpos > 0) {
+       f->mode |= f->mode-1;
+
+       if (f->rpos != f->rend) {
                /* First exhaust the buffer. */
                k = MIN(f->rend - f->rpos, l);
                memcpy(dest, f->rpos, k);
@@ -21,15 +22,10 @@ size_t fread(void *destv, size_t size, size_t nmemb, FILE *f)
                l -= k;
        }
        
-       if (!l) {
-               FUNLOCK(f);
-               return nmemb;
-       }
-
        /* Read the remainder directly */
        for (; l; l-=k, dest+=k) {
-               k = f->read(f, dest, l);
-               if (k+1<=1) {
+               k = __toread(f) ? 0 : f->read(f, dest, l);
+               if (!k) {
                        FUNLOCK(f);
                        return (len-l)/size;
                }