Libc-763.11.tar.gz

[apple/libc.git] / stdio / FreeBSD / fread.c

diff --git a/stdio/FreeBSD/fread.c b/stdio/FreeBSD/fread.c
index ad5d81bf3e84b538f13d96a91e15b26a8875f221..2430dab03f641e9c6055a260064e6c2d01094954 100644 (file)
--- a/stdio/FreeBSD/fread.c
+++ b/stdio/FreeBSD/fread.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)fread.c    8.2 (Berkeley) 12/11/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.12 2002/10/12 16:13:37 mike Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.16 2009/07/12 13:09:43 ed Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
@@ -47,11 +43,23 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.12 2002/10/12 16:13:37 mike E
 #include "local.h"
 #include "libc_private.h"
 
+/*
+ * MT-safe version
+ */
+
 size_t
-fread(buf, size, count, fp)
-       void * __restrict buf;
-       size_t size, count;
-       FILE * __restrict fp;
+fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
+{
+       size_t ret;
+
+       FLOCKFILE(fp);
+       ret = __fread(buf, size, count, fp);
+       FUNLOCKFILE(fp);
+       return (ret);
+}
+
+size_t
+__fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
 {
        size_t resid;
        char *p;
@@ -59,13 +67,10 @@ fread(buf, size, count, fp)
        size_t total;
 
        /*
-        * The ANSI standard requires a return value of 0 for a count
-        * or a size of 0.  Peculiarily, it imposes no such requirements
-        * on fwrite; it only requires fread to be broken.
+        * ANSI and SUSv2 require a return value of 0 if size or count are 0.
         */
        if ((resid = count * size) == 0)
                return (0);
-       FLOCKFILE(fp);
        ORIENT(fp, -1);
        if (fp->_r < 0)
                fp->_r = 0;
@@ -79,13 +84,11 @@ fread(buf, size, count, fp)
                resid -= r;
                if (__srefill(fp)) {
                        /* no more input: return partial result */
-                       FUNLOCKFILE(fp);
                        return ((total - resid) / size);
                }
        }
        (void)memcpy((void *)p, (void *)fp->_p, resid);
        fp->_r -= resid;
        fp->_p += resid;
-       FUNLOCKFILE(fp);
        return (count);
 }