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, 33 insertions, 8 deletions

diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 3623ba7f9..e88b6c722 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -21,11 +21,14 @@ FUNCTION
 
 INDEX
 	fseeko64
+INDEX
+	_fseeko64_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fseeko64(FILE *<[fp]>, _off64_t <[offset]>, int <[whence]>)
-
+	int _fseeko64_r (struct _reent *<[ptr]>, FILE *<[fp]>, 
+                         _off64_t <[offset]>, int <[whence]>)
 TRAD_SYNOPSIS
 	#include <stdio.h>
 
@@ -34,6 +37,12 @@ TRAD_SYNOPSIS
 	_off64_t <[offset]>;
 	int <[whence]>;
 
+	int _fseeko64_r (<[ptr]>, <[fp]>, <[offset]>, <[whence]>)
+	struct _reent *<[ptr]>;
+	FILE *<[fp]>;
+	_off64_t <[offset]>;
+	int <[whence]>;
+
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
@@ -89,15 +98,17 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
  */
 
 _off64_t
-fseeko64 (fp, offset, whence)
-     register FILE *fp;
-     _off64_t offset;
-     int whence;
+_DEFUN (_fseeko64_r, (ptr, fp, offset, whence),
+     struct _reent *ptr _AND
+     register FILE *fp _AND
+     _off64_t offset _AND
+     int whence)
 {
-  struct _reent *ptr;
   _fpos64_t _EXFUN ((*seekfn), (void *, _fpos64_t, int));
   _fpos64_t target, curoff;
   size_t n;
+
+  /* FIXME: this should be stat64. */
   struct stat st;
   int havepos;
 
@@ -106,7 +117,8 @@ fseeko64 (fp, offset, whence)
   /* Make sure stdio is set up.  */
 
   CHECK_INIT (fp);
-  ptr = fp->_data;
+
+  curoff = fp->_offset;
 
   /* If we've been doing some writing, and we're in append mode
      then we don't really know where the filepos is.  */
@@ -193,7 +205,7 @@ fseeko64 (fp, offset, whence)
     {
       if (seekfn != __sseek64
 	  || fp->_file < 0
-	  || _fstat64_r (ptr, fp->_file, &st)
+	  || _fstat_r (ptr, fp->_file, &st)
 	  || (st.st_mode & S_IFMT) != S_IFREG)
 	{
 	  fp->_flags |= __SNPT;
@@ -328,4 +340,17 @@ dumb:
   return 0;
 }
 
+#ifndef _REENT_ONLY
+
+_off64_t
+_DEFUN (fseeko64_r, (fp, offset, whence),
+     register FILE *fp _AND
+     _off64_t offset _AND
+     int whence)
+{
+  return _fseeko64_r (_REENT, fp, offset, whence);
+}
+
+#endif /* !_REENT_ONLY */
+
 #endif /* __LARGE64_FILES */