Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
	[! libc.so-version]: Clear static-only-routines.
	($(common-objpfx)sor-$(subdir)): New target.
	[static-only-routines]: New static pattern rule for these .so's.
	* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
	[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
	New targets replace it.
	(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
	$(slibdir)/libc.so.
	* io/Makefile (static-only-routines): New variable.
	* configure.in: Check for tools objdump and objcopy, and for awk.
	* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.

Thu May  9 01:24:00 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/config.h: Remove definition of wint_t.

	* locale/programs/ld-collate.c: Include <wchar.h> instead of
	<wcstr.h>.

	* manual/time.texi: Add some more description for %U and %W
	format of strftime.  Describe new format %V of strftime.

	* resolv/gethnamaddr.c: Prevent warning by preventing variable
	definition.
	* stdio-common/_itoa.c: Ditto.

Tue May  7 23:43:07 1996  Ulrich Drepper  <drepper@cygnus.com>

	* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
	libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
	libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
	libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
	libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
	libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
	libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
	libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
	libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
	libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
	stdio-common/vfscanf.c: Prepare for reentrent libio.

	* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
	libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
	libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
	Used in reentrent libio.

	* misc/getusershell.c: Prevent warnings.

1 files changed, 56 insertions, 29 deletions

diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index bc7acd6..4b4dd11 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -54,38 +54,59 @@ Cambridge, MA 02139, USA.  */
 
 # define va_list	_IO_va_list
 # define ungetc(c, s)	_IO_ungetc (c, s)
-# define inchar()	((c = _IO_getc (s)), (void) ++read_in, c)
-# define conv_error()	return ((void) (errp != NULL && (*errp |= 2)), \
-				(void) (c == EOF || _IO_ungetc (c, s)), done)
-
-# define input_error()	return ((void) (errp != NULL && (*errp |= 1)), \
-				done == 0 ? EOF : done)
-# define memory_error()	return ((void) (errno = ENOMEM), EOF)
-# define ARGCHECK(s, format)						     \
-  do									     \
-    {									     \
-      /* Check file argument for consistence.  */			     \
-      CHECK_FILE (s, -1);						     \
-      if (s->_flags & _IO_NO_READS || format == NULL)			     \
-       {								     \
-         MAYBE_SET_EINVAL;						     \
-         return -1;							     \
-       }								     \
+# define inchar()	((c = _IO_getc_unlocked (s)), (void) ++read_in, c)
+# define conv_error()	do {						      \
+			  if (errp != NULL) *errp |= 2;			      \
+			  if (c != EOF) _IO_ungetc (c, s);		      \
+			  _IO_funlockfile (s);				      \
+			  return done;					      \
+			} while (0)
+# define input_error()	do {						      \
+			  _IO_funlockfile (s);				      \
+			  if (errp != NULL) *errp |= 1;			      \
+			  return done ?: EOF;				      \
+			} while (0)
+# define memory_error()	do {						      \
+			  _IO_funlockfile (s);				      \
+			  errno = ENOMEM;				      \
+			  return EOF;					      \
+			} while (0)
+# define ARGCHECK(s, format)						      \
+  do									      \
+    {									      \
+      /* Check file argument for consistence.  */			      \
+      CHECK_FILE (s, EOF);						      \
+      if (s->_flags & _IO_NO_READS || format == NULL)			      \
+       {								      \
+         MAYBE_SET_EINVAL;						      \
+         return EOF;							      \
+       }								      \
     } while (0)
 #else
 # define inchar()	((c = getc (s)), (void) ++read_in, c)
-# define conv_error()	return ((void) ungetc (c, s), done)
-# define input_error()	return (done == 0 ? EOF : done)
-# define memory_error()	return ((void) (errno = ENOMEM), EOF)
-# define ARGCHECK(s, format)						     \
-  do									     \
-    {									     \
-      /* Check file argument for consistence.  */			     \
-      if (!__validfp (s) || !s->__mode.__read || format == NULL)	     \
-	{								     \
-	  errno = EINVAL;						     \
-	  return -1;							     \
-	}								     \
+# define conv_error()	do {						      \
+			  funlockfile (s);				      \
+			  ungetc (c, s);				      \
+			  return done;					      \
+			} while (0)
+# define input_error()	do {						      \
+			  funlockfile (s);				      \
+			  return done ?: EOF;				      \
+			} while (0)
+# define memory_error()	do {						      \
+			  funlockfile (s);				      \
+			  errno = ENOMEM;				      \
+			  return EOF;					      \
+			} while (0)
+# define ARGCHECK(s, format)						      \
+  do									      \
+    {									      \
+      /* Check file argument for consistence.  */			      \
+      if (!__validfp (s) || !s->__mode.__read || format == NULL)	      \
+	{								      \
+	  errno = EINVAL;						      \
+	  return EOF;							      \
+	}								      \
     } while (0)
 #endif
 
@@ -173,6 +194,9 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	      strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
     thousands = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
 
+  /* Lock the stream.  */
+  flockfile (s);
+  
   c = inchar ();
 
   /* Run through the format string.  */
@@ -781,6 +805,9 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
     while (isspace (c))
       (void) inchar ();
 
+  /* Unlock stream.  */
+  funlockfile (s);
+  
   return ((void) (c == EOF || ungetc (c, s)), done);
 }