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, 34 insertions, 4 deletions

diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 663fff62c..8a2159c4a 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -21,12 +21,18 @@ FUNCTION
 
 INDEX
 	fwrite
+INDEX
+	_fwrite_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	size_t fwrite(const void *<[buf]>, size_t <[size]>,
 		      size_t <[count]>, FILE *<[fp]>);
 
+	#include <stdio.h>
+	size_t _fwrite_r(struct _reent *<[ptr[>, const void *<[buf]>, size_t <[size]>,
+		      size_t <[count]>, FILE *<[fp]>);
+
 TRAD_SYNOPSIS
 	#include <stdio.h>
 	size_t fwrite(<[buf]>, <[size]>, <[count]>, <[fp]>)
@@ -35,6 +41,14 @@ TRAD_SYNOPSIS
 	size_t <[count]>;
 	FILE *<[fp]>;
 
+	#include <stdio.h>
+	size_t _fwrite_r(<[ptr]>, <[buf]>, <[size]>, <[count]>, <[fp]>)
+	struct _reent *<[ptr]>;
+	char *<[buf]>;
+	size_t <[size]>;
+	size_t <[count]>;
+	FILE *<[fp]>;
+
 DESCRIPTION
 <<fwrite>> attempts to copy, starting from the memory location
 <[buf]>, <[count]> elements (each of size <[size]>) into the file or
@@ -44,6 +58,9 @@ stream identified by <[fp]>.  <<fwrite>> may copy fewer elements than
 <<fwrite>> also advances the file position indicator (if any) for
 <[fp]> by the number of @emph{characters} actually written.
 
+<<_fwrite_r>> is simply the reentrant version of <<fwrite>> that
+takes an additional reentrant structure argument: <[ptr]>.
+
 RETURNS
 If <<fwrite>> succeeds in writing all the elements you specify, the
 result is the same as the argument <[count]>.  In any event, the
@@ -78,7 +95,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 size_t
-_DEFUN(fwrite, (buf, size, count, fp),
+_DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
+       struct _reent * ptr _AND
        _CONST _PTR buf _AND
        size_t size     _AND
        size_t count    _AND
@@ -94,15 +112,15 @@ _DEFUN(fwrite, (buf, size, count, fp),
   uio.uio_iovcnt = 1;
 
   /*
-   * The usual case is success (__sfvwrite returns 0);
+   * The usual case is success (__sfvwrite_r returns 0);
    * skip the divide if this happens, since divides are
    * generally slow and since this occurs whenever size==0.
    */
 
-  CHECK_INIT(_REENT);
+  CHECK_INIT(ptr);
 
   _flockfile (fp);
-  if (__sfvwrite (fp, &uio) == 0)
+  if (__sfvwrite_r (ptr, fp, &uio) == 0)
     {
       _funlockfile (fp);
       return count;
@@ -110,3 +128,15 @@ _DEFUN(fwrite, (buf, size, count, fp),
   _funlockfile (fp);
   return (n - uio.uio_resid) / size;
 }
+
+#ifndef _REENT_ONLY
+size_t
+_DEFUN(fwrite, (buf, size, count, fp),
+       _CONST _PTR buf _AND
+       size_t size     _AND
+       size_t count    _AND
+       FILE * fp)
+{
+  return _fwrite_r (_REENT, buf, size, count, fp);
+}
+#endif