Libc-1439.100.3.tar.gz

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

diff --git a/stdio/FreeBSD/rewind.c b/stdio/FreeBSD/rewind.c
index 76f2ed370c60d2d2952fcdf0deee33a5c59c6ba4..33aea2f5515bbecadc4d5f895a8050058057cea3 100644 (file)
--- a/stdio/FreeBSD/rewind.c
+++ b/stdio/FreeBSD/rewind.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[] = "@(#)rewind.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/rewind.c,v 1.11 2002/03/22 21:53:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/rewind.c,v 1.12 2007/01/09 00:28:07 imp Exp $");
 
 #include "namespace.h"
 #include <errno.h>
@@ -53,13 +49,12 @@ rewind(FILE *fp)
        int serrno = errno;
 
        /* make sure stdio is set up */
-       if (!__sdidinit)
-               __sinit();
+       pthread_once(&__sdidinit, __sinit);
 
        FLOCKFILE(fp);
        if (_fseeko(fp, (off_t)0, SEEK_SET, 1) == 0) {
-               clearerr_unlocked(fp);
                errno = serrno;
        }
+       clearerr_unlocked(fp);  /* POSIX: clear stdio error regardless */
        FUNLOCKFILE(fp);
 }