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, 23 insertions, 1 deletions

diff --git a/newlib/libc/stdio/putc_u.c b/newlib/libc/stdio/putc_u.c
index aee11f4e7..9960654d7 100644
--- a/newlib/libc/stdio/putc_u.c
+++ b/newlib/libc/stdio/putc_u.c
@@ -21,11 +21,16 @@ FUNCTION
 
 INDEX
 	putc_unlocked
+INDEX
+	_putc_unlocked_r
 
 POSIX_SYNOPSIS
 	#include <stdio.h>
 	int putc_unlocked(int <[ch]>, FILE *<[fp]>);
 
+	#include <stdio.h>
+	int _putc_unlocked_r(struct _reent *<[ptr]>, int <[ch]>, FILE *<[fp]>);
+
 DESCRIPTION
 <<putc_unlocked>> is a non-thread-safe version of <<putc>> declared in
 <<stdio.h>>.  <<putc_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
 <<putc_unlocked>> is equivalent to <<putc>>.
 
+The function <<_putc_unlocked_r>> is simply the reentrant version of
+<<putc_unlocked>> that takes an additional reentrant structure pointer
+argument: <[ptr]>.
+
 RETURNS
 See <<putc>>.
 
@@ -61,11 +70,24 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef putc_unlocked
 
 int
+_DEFUN(_putc_unlocked_r, (ptr, c, fp),
+       struct _reent *ptr _AND
+       int c _AND
+       register FILE *fp)
+{
+  /* CHECK_INIT is (eventually) called by __swbuf.  */
+
+  return __sputc_r (ptr, c, fp);
+}
+
+#ifndef _REENT_ONLY
+int
 _DEFUN(putc_unlocked, (c, fp),
        int c _AND
        register FILE *fp)
 {
   /* CHECK_INIT is (eventually) called by __swbuf.  */
 
-  return __sputc (c, fp);
+  return __sputc_r (_REENT, c, fp);
 }
+#endif /* !_REENT_ONLY */