2003-08-22 Jeff Johnston <jjohnstn@redhat.com>

	* libc/include/sys/reent.h: Add _GLOBAL_REENT macro.
	* libc/stdio: Globally remove/replace all references to fp->_data.
	Replace with _REENT or _GLOBAL_REENT where appropriate.
	* libc/stdio/asprintf.c: Ditto.
	* libc/stdio/fclose.c: Ditto.
	* libc/stdio/fvwrite.c: Ditto.
	* libc/stdio/makebuf.c: Ditto.
	* libc/stdio/refill.c: Ditto.
	* libc/stdio/local.h: Ditto.
	* libc/stdio/setvbuf.c: Ditto.
	* libc/stdio/sscanf.c: Ditto.
	* libc/stdio/stdio.c: Ditto.
	* libc/stdio/ungetc.c: Ditto.
	* libc/stdio/vfscanf.c: Ditto.
	* libc/stdio/vsscanf.c: Ditto.
	* libc/stdio/fopen.c: Ditto.  Also use _fseek_r in _fopen_r.
	* libc/stdio/vasprintf.c: Ditto.  Also call _vfprintf_r directly.
	* libc/stdio/vsnprintf.c: Ditto.
	* libc/stdio/vsprintf.c: Ditto.
	* libc/stdio/fcloseall.c(fcloseall): Use _GLOBAL_REENT macro
	instead of _REENT to walk file list.
	* libc/stdio/fflush.c: Ditto.
	* libc/stdio/fgetpos.c: Add reentrant version and have regular
	version call reentrant version with _REENT argument.
	* libc/stdio/fsetpos.c: Ditto.
	* libc/stdio/fseek.c: Ditto.
	* libc/stdio/fseeko.c: Ditto.
	* libc/stdio/ftell.c: Ditto.
	* libc/stdio/ftello.c: Ditto.
	* libc/stdio/freopen.c: Ditto.
	* libc/stdio/findfp.c: Use _GLOBAL_REENT pointer when adding
	new files to chain.  Also use _GLOBAL_REENT pointer for
	cleaning up.
	* libc/stdio/fiprintf.c: Reformatted to minimize duplicate code.
	* libc/stdio/siprintf.c: Ditto.
	* libc/stdio/iprintf.c: Ditto.
	* libc/stdio/fprintf.c: Ditto.
	* libc/stdio/printf.c: Ditto.
	* libc/stdio/snprintf.c: Call _vfprintf_r directly.
	* libc/stdio/sprintf.c: Ditto.
	* libc/stdio/vprintf.c: Ditto.  Also add _REENT_ONLY check.
	* libc/stdio/rewind.c: Call _fseek_r directly.
	* libc/stdio/tmpfile.c: Call _fopen_r and _remove_r directly.
	* libc/stdio/vfprintf.c (_VFPRINTF_R): Change _r routines to use
	data pointer.
	(get_arg): Add extra struct _reent pointer argument.
	* libc/stdio64/fgetpos64.c: Add _r versions, remove any reference
	to fp->_data.
	* libc/stdio64/fopen64.c: Ditto.
	* libc/stdio64/freopen64.c: Ditto.
	* libc/stdio64/fsetpos64.c: Ditto.
	* libc/stdio64/ftello64.c: Ditto.
	* libc/stdio64/local64.h: Ditto.
	* libc/stdio64/stdio64.c: Ditto.
	* libc/stdio64/fseeko64.c: Ditto plus use _fstat_r instead of
	_fstat64_r for the meantime.

1 files changed, 29 insertions, 5 deletions

diff --git a/newlib/libc/stdio64/stdio64.c b/newlib/libc/stdio64/stdio64.c
index 7b9e16480..35967ad99 100644
--- a/newlib/libc/stdio64/stdio64.c
+++ b/newlib/libc/stdio64/stdio64.c
@@ -26,7 +26,8 @@
 
 #ifdef __LARGE64_FILES
 _fpos64_t
-__sseek64 (cookie, offset, whence)
+__sseek64_r (ptr, cookie, offset, whence)
+     struct _reent *ptr;
      _PTR cookie;
      _fpos64_t offset;
      int whence;
@@ -34,7 +35,7 @@ __sseek64 (cookie, offset, whence)
   register FILE *fp = (FILE *) cookie;
   register _off64_t ret;
 
-  ret = _lseek64_r (fp->_data, fp->_file, (_off64_t) offset, whence);
+  ret = _lseek64_r (ptr, fp->_file, (_off64_t) offset, whence);
   if (ret == (_fpos64_t)-1L)
     fp->_flags &= ~__SOFF;
   else
@@ -46,7 +47,8 @@ __sseek64 (cookie, offset, whence)
 }
 
 _READ_WRITE_RETURN_TYPE
-__swrite64 (cookie, buf, n)
+__swrite64_r (ptr, cookie, buf, n)
+     struct _reent *ptr;
      _PTR cookie;
      char _CONST *buf;
      int n;
@@ -58,7 +60,7 @@ __swrite64 (cookie, buf, n)
 #endif
 
   if (fp->_flags & __SAPP)
-    (void) _lseek64_r (fp->_data, fp->_file, (_off64_t)0, SEEK_END);
+    (void) _lseek64_r (ptr, fp->_file, (_off64_t)0, SEEK_END);
   fp->_flags &= ~__SOFF;	/* in case O_APPEND mode is set */
 
 #ifdef __SCLE
@@ -66,7 +68,7 @@ __swrite64 (cookie, buf, n)
     oldmode = setmode(fp->_file, O_BINARY);
 #endif
 
-  w = _write_r (fp->_data, fp->_file, buf, n);
+  w = _write_r (ptr, fp->_file, buf, n);
 
 #ifdef __SCLE
   if (oldmode)
@@ -75,5 +77,27 @@ __swrite64 (cookie, buf, n)
 
   return w;
 }
+
+#ifndef _REENT_ONLY
+_fpos64_t
+__sseek64 (cookie, offset, whence)
+     _PTR cookie;
+     _fpos64_t offset;
+     int whence;
+{
+  return __sseek64_r (_REENT, cookie, offset, whence);
+}
+
+_READ_WRITE_RETURN_TYPE
+__swrite64 (cookie, buf, n)
+     _PTR cookie;
+     char _CONST *buf;
+     int n;
+{
+  return __swrite64_r (_REENT, cookie, buf, n);
+}
+
+#endif /* !_REENT_ONLY */
+
 #endif /* __LARGE64_FILES */