* libc/include/wchar.h (fwscanf, swscanf, vfwscanf, vswscanf, vwscanf,

	wscanf): Declare.
	(_fwscanf_r, _swscanf_r, _vfwscanf_r, _vswscanf_r, _vwscanf_r,
	_wscanf_r): Declare.
	* libc/stdio/Makefile.am: Add new wscanf files.
	* libc/stdio/Makefile.in: Regenerate.
	* libc/stdio/fwscanf.c: New file.
	* libc/stdio/local.h (__svfwscanf_r, __ssvfwscanf_r, __svfiwscanf_r,
	__ssvfiwscanf_r): Declare.
	* libc/stdio/stdio.tex: Add new documentation references.
	* libc/stdio/swscanf.c: New file.
	* libc/stdio/vfwscanf.c: New file.
	* libc/stdio/vswscanf.c: New file.
	* libc/stdio/vwscanf.c: New file.
	* libc/stdio/wscanf.c: New file.

	* libc/stdio/vfscanf.c (_sungetc_r): Make externaly available.  Only
	define if INTEGER_ONLY is defined.  Declare otherwise.
	(__ssrefill_r): Ditto.
	(_sfread_r): Ditto.

	Remove static eofread/eofread1 functions and use __seofread
	function instead, throughout.
	* libc/stdio/local.h (__seofread): Declare.
	* libc/stdio/stdio.c (__seofread): Define.

	* libc/stdio/fgetwc.c (__fgetwc): Fix compiler warning.
	* libc/stdio/fgetws.c (_fgetws_r): Ditto.
	* libc/stdio/fread.c (_fread_r): Ditto.
	* libc/stdio/vfprintf.c: Ditto.
	* libc/stdio/vswprintf.c: Ditto.

1 files changed, 10 insertions, 6 deletions

diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 8546088a8..b24c9fb84 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -293,11 +293,11 @@ _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
 }
 #endif /* !STRING_ONLY */
 
-#ifdef STRING_ONLY
+#if defined (STRING_ONLY) && defined (INTEGER_ONLY)
 /* When dealing with the sscanf family, we don't want to use the
  * regular ungetc which will drag in file I/O items we don't need.
  * So, we create our own trimmed-down version.  */
-static int
+int
 _DEFUN(_sungetc_r, (data, fp, ch),
 	struct _reent *data _AND
 	int c               _AND
@@ -355,7 +355,7 @@ _DEFUN(_sungetc_r, (data, fp, ch),
 }
 
 /* String only version of __srefill_r for sscanf family.  */
-static int
+int
 _DEFUN(__ssrefill_r, (ptr, fp),
        struct _reent * ptr _AND
        register FILE * fp)
@@ -381,7 +381,7 @@ _DEFUN(__ssrefill_r, (ptr, fp),
   return EOF;
 }
 
-static size_t
+size_t
 _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
        struct _reent * ptr _AND
        _PTR buf _AND
@@ -418,7 +418,11 @@ _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
   fp->_p += resid;
   return count;
 }
-#endif /* STRING_ONLY */
+#else /* !STRING_ONLY || !INTEGER_ONLY */
+int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
+int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
+size_t _EXFUN (_sfread_r, (struct _reent *, _PTR buf, size_t, size_t, FILE *));
+#endif /* !STRING_ONLY || !INTEGER_ONLY */
 
 int
 _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
@@ -717,7 +721,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	  break;
 
 	case '[':
-	  fmt = __sccl (ccltab, fmt);
+	  fmt = (u_char *) __sccl (ccltab, (unsigned char *) fmt);
 	  flags |= NOSKIP;
 	  c = CT_CCL;
 	  break;