Changeset 232 for branches/samba-3.2.x/source/lib/xfile.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/lib/xfile.c (modified) (1 diff)

branches/samba-3.2.x/source/lib/xfile.c

@@ -355 +355 @@
 size_t x_fread(void *p, size_t size, size_t nmemb, XFILE *f)
 {
+        size_t remaining = size * nmemb;
         size_t total = 0;
-        while (total < size*nmemb) {
-                int c = x_fgetc(f);
-                if (c == EOF) break;
-                (total+(char *)p)[0] = (char)c;
-                total++;
+
+        while (remaining > 0) {
+                size_t thistime;
+
+                x_fillbuf(f);
+
+                if (f->bufused == 0) {
+                        f->flags |= X_FLAG_EOF;
+                        break;
+                }
+
+                thistime = MIN(f->bufused, remaining);
+
+                memcpy((char *)p+total, f->next, thistime);
+
+                f->next += thistime;
+                f->bufused -= thistime;
+                remaining -= thistime;
+                total += thistime;
         }
         return total/size;