Libc-1439.100.3.tar.gz

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

diff --git a/stdio/FreeBSD/getchar.c b/stdio/FreeBSD/getchar.c
index 12bd62f9d83f1f77b8603267fb4c7734486c48cd..a17496af0f343f6574097e31a57fff158e8486b0 100644 (file)
--- a/stdio/FreeBSD/getchar.c
+++ b/stdio/FreeBSD/getchar.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[] = "@(#)getchar.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.10 2002/08/13 09:30:41 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.15 2008/05/05 16:03:52 jhb Exp $");
 
 /*
  * A subroutine version of the macro getchar.
@@ -50,14 +46,23 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.10 2002/08/13 09:30:41 tjr
 #include "libc_private.h"
 
 #undef getchar
+#undef getchar_unlocked
 
 int
 getchar()
 {
        int retval;
        FLOCKFILE(stdin);
-       ORIENT(stdin, -1);
-       retval = getc(stdin);
+       /* Orientation set by __sgetc() when buffer is empty. */
+       /* ORIENT(stdin, -1); */
+       retval = __sgetc(stdin);
        FUNLOCKFILE(stdin);
        return (retval);
 }
+
+int
+getchar_unlocked(void)
+{
+
+       return (__sgetc(stdin));
+}