2001-04-20 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/stdio.h[!_REENT_ONLY]: Moved various functions together
        into one list.
        [!__STRICT_ANSI__]: Moved non-ANSI I/O functions in this list.
        (vfscanf, vscanf, vsscanf, _vfscanf_r, _vscanf_r, _vsscanf_r): New
        function prototypes.
        (_fscanf_r, _sscanf_r): Ditto.
        * libc/include/stdlib.h: Added _strtod_r prototype.
        * libc/stdio/Makefile.am: Add new v*scanf functions.
        * libc/stdio/Makefile.in: Regenerate.
        * libc/stdio/fscanf.c: Reorganized so HAVE_STDC only affects prototype
        and code is shared.  Added reentrant _fscanf_r which calls __svfscanf_r.        * libc/stdio/scanf.c: Changed to call __svfscanf_r.
        * libc/stdio/sscanf.c: Changed documentation to add reentrant routines.
        (sscanf): Changed to call __svfscanf_r with _REENT argument.
        (_sscanf_r): New routine.
        * libc/stdio/local.h: Removed __svfscanf prototype and replaced it
        with __svfscanf_r prototype.
        * libc/stdio/vfscanf.c (vfscanf, _vfscanf_r: New
        routines.
        (__svfscanf_r): Reentrant version of __svfscanf which takes reetrancy
        structure as argument as calls reentrant versions of helper functions
        (e.g. _strtol_r, _strtoul_r). Also replaced calls to atol and atof
        to _strtol_r and _strtod_r respectively.
        * libc/stdio/vfscanf.c: Also changed __svfscanf to call __svfscanf_r.
        * libc/stdlib/strtod.c (strtod): Changed to call _strtod_r with
        _REENT argument.
        * libc/stdio/vscanf.c: New file.
        * libc/stdio/vsscanf.c: Ditto.

1 files changed, 7 insertions, 3 deletions

diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index 0a4818934..5dd14fde4 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -25,6 +25,8 @@
 #include <varargs.h>
 #endif
 
+#include "local.h"
+
 #ifndef _REENT_ONLY
 
 int
@@ -44,12 +46,12 @@ scanf (fmt, va_alist)
 #else
   va_start (ap);
 #endif
-  ret = __svfscanf (_stdin_r (_REENT), fmt, ap);
+  ret = __svfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
   va_end (ap);
   return ret;
 }
 
-#endif
+#endif /* !_REENT_ONLY */
 
 int
 #ifdef _HAVE_STDC
@@ -69,7 +71,9 @@ _scanf_r (ptr, fmt, va_alist)
 #else
   va_start (ap);
 #endif
-  ret = __svfscanf (_stdin_r (ptr), fmt, ap);
+  ret = __svfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
   va_end (ap);
   return (ret);
 }
+
+