projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix dlsym of thread-local symbols on archs with DTP_OFFSET!=0
[musl]
/
src
/
stdio
/
fread.c
diff --git
a/src/stdio/fread.c
b/src/stdio/fread.c
index
0fa0b2a
..
a2116da
100644
(file)
--- a/
src/stdio/fread.c
+++ b/
src/stdio/fread.c
@@
-1,49
+1,38
@@
#include "stdio_impl.h"
#include "stdio_impl.h"
+#include <string.h>
#define MIN(a,b) ((a)<(b) ? (a) : (b))
#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;
{
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);
FLOCK(f);
- for (;;) {
+ 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);
f->rpos += k;
dest += k;
l -= k;
/* First exhaust the buffer. */
k = MIN(f->rend - f->rpos, l);
memcpy(dest, f->rpos, k);
f->rpos += k;
dest += k;
l -= k;
-
- /* Stop on EOF or errors */
- if (f->flags & (F_EOF|F_ERR|F_NORD)) goto eof;
-
- /* Done? Or going unbuffered? */
- if (!l || l > f->buf_size/2) break;
-
- /* Otherwise, refill & read thru buffer. */
- __underflow(f);
}
}
-
+
/* Read the remainder directly */
for (; l; l-=k, dest+=k) {
/* Read the remainder directly */
for (; l; l-=k, dest+=k) {
- k = f->read(f, dest, l);
- if (
k+1<=1
) {
-
f->flags |= F_EOF | (F_ERR & k
);
-
goto eof
;
+ k =
__toread(f) ? 0 :
f->read(f, dest, l);
+ if (
!k
) {
+
FUNLOCK(f
);
+
return (len-l)/size
;
}
}
FUNLOCK(f);
return nmemb;
}
}
FUNLOCK(f);
return nmemb;
-eof:
- FUNLOCK(f);
- return (len-l)/size;
}
weak_alias(fread, fread_unlocked);
}
weak_alias(fread, fread_unlocked);