#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);
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;
}