Libc-1439.100.3.tar.gz

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

diff --git a/stdio/FreeBSD/getc.c b/stdio/FreeBSD/getc.c
index 226a1fe82e5f44e0509cfaec8af835189f0cc9f1..06ad2a3941907408e213a3e1f80dd47d6fafc20a 100644 (file)
--- a/stdio/FreeBSD/getc.c
+++ b/stdio/FreeBSD/getc.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[] = "@(#)getc.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.11 2002/08/13 09:30:41 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.16 2008/05/05 16:03:52 jhb Exp $");
 
 #include "namespace.h"
 #include <stdio.h>
@@ -46,13 +42,24 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.11 2002/08/13 09:30:41 tjr Exp
 #include "libc_private.h"
 #include "local.h"
 
+#undef getc
+#undef getc_unlocked
+
 int
 getc(FILE *fp)
 {
        int retval;
        FLOCKFILE(fp);
-       ORIENT(fp, -1);
+       /* Orientation set by __sgetc() when buffer is empty. */
+       /* ORIENT(fp, -1); */
        retval = __sgetc(fp);
        FUNLOCKFILE(fp);
        return (retval);
 }
+
+int
+getc_unlocked(FILE *fp)
+{
+
+       return (__sgetc(fp));
+}