2006-06-14 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/stdio.h: Add new reentrant I/O prototypes for
        read/write functions.  Change getc/putc macros to have reentrant underlying
        macros/functions.  This includes __sgetc_raw_r, __sgetc_r, and __sputc_r.
        * libc/stdio/fgetc.c: Fix and/or add reentrant version to call
        new reentrant I/O functions/macros for reading/writing.
        * libc/stdio/fgets.c: Ditto.
        * libc/stdio/fputc.c: Ditto.
        * libc/stdio/fputs.c: Ditto.
        * libc/stdio/fread.c: Ditto.
        * libc/stdio/fseek.c: Ditto.
        * libc/stdio64/fseeko64.c: Ditto.
        * libc/stdio/fwrite.c: Ditto.
        * libc/stdio/getc.c: Ditto.
        * libc/stdio/getc_u.c: Ditto.
        * libc/stdio/getchar.c: Ditto.
        * libc/stdio/getchar_u.c: Ditto.
        * libc/stdio/putc.c: Ditto.
        * libc/stdio/putc_u.c: Ditto.
        * libc/stdio/putchar.c: Ditto.
        * libc/stdio/puts.c: Ditto.
        * libc/stdio/vfprintf.c: Ditto.
        * libc/stdio/vfscanf.c: Ditto.
        * libc/stdio/fvwrite.c: Change __sfvwrite into reentrant __sfvwrite_r.
        Change all previous callers of __sfvwrite.  Set errno to EBADF and
        set error flag on if attempt is made to write to file that does not
        allow writing.
        * libc/stdio/fvwrite.h: Fix new reentrant prototypes.
        * libc/stdio/local.h: Ditto.
        * libc/stdio/refill.c: Turn __srefill into reentrant __srefill_r.
        Set errno to EBADF and the error flag on if attempt is made to
        read unreadable file.  Change all previous callers of __srefill.
        * libc/stdio/rget.c
        * libc/stdio/wbuf.c: Turn __swbuf into reentrant __swbuf_r.  Change
        all previous callers of __swbuf.
        * libc/sys/linux/machine/i386/huge_val.h: Ifdef out file contents since
        huge value macros are already defined correctly for i386 by <math.h>.

1 files changed, 24 insertions, 3 deletions

diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c
index 9c05fa6f5..7d7adde60 100644
--- a/newlib/libc/stdio/getc_u.c
+++ b/newlib/libc/stdio/getc_u.c
@@ -21,11 +21,16 @@ FUNCTION
 
 INDEX
 	getc_unlocked
+INDEX
+	_getc_unlocked_r
 
 POSIX_SYNOPSIS
 	#include <stdio.h>
 	int getc_unlocked(FILE *<[fp]>);
 
+	#include <stdio.h>
+	int _getc_unlocked_r(FILE *<[fp]>);
+
 DESCRIPTION
 <<getc_unlocked>> is a non-thread-safe version of <<getc>> declared in
 <<stdio.h>>.  <<getc_unlocked>> may only safely be used within a scope
@@ -36,6 +41,10 @@ object, as is the case after a successful call to the flockfile() or
 ftrylockfile() functions.  If threads are disabled, then
 <<getc_unlocked>> is equivalent to <<getc>>.
 
+The <<_getc_unlocked_r>> function is simply the reentrant version of
+<<get_unlocked>> which passes an additional reentrancy structure pointer
+argument: <[ptr]>.
+
 RETURNS
 See <<getc>>.
 
@@ -60,10 +69,22 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef getc_unlocked
 
 int
-_DEFUN(getc_unlocked, (fp),
+_DEFUN(_getc_unlocked_r, (ptr, fp),
+       struct _reent *ptr _AND
        register FILE *fp)
 {
-  /* CHECK_INIT is called (eventually) by __srefill.  */
+  /* CHECK_INIT is called (eventually) by __srefill_r.  */
 
-  return __sgetc (fp);
+  return __sgetc_r (ptr, fp);
 }
+
+#ifndef _REENT_ONLY
+
+int
+_DEFUN(getc_unlocked, (fp),
+       register FILE *fp)
+{
+  return __sgetc_r (_REENT, fp);
+}
+
+#endif /* !_REENT_ONLY */