2004-11-23 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/stdio.h: Add new iprintf and iscanf variants.  Also
        do some reordering.
        * libc/machine/powerpc/vfscanf.c: Remove __sccl function.
        * libc/stdio/Makefile.am: Add support for new iprintf and iscanf
        family functions.
        * libc/stdio/Makefile.in: Regenerated.
        * libc/stdio/fiprintf.c: Remove doc to siprintf.c.
        * libc/stdio/iprintf.c: Ditto.
        * libc/stdio/local.h (__svfiscanf_r): New prototype.
        * libc/stdio/siprintf.c: Add docs for various iprintf family functions.
        * libc/stdio/sniprintf.c: Move docs to siprintf.c.
        * libc/stdio/stdio.tex: Add new functions.
        * libc/stdio/vfscanf.c: Split out __sccl function to separate
        file and add special name defines so this file can be used
        to build vfiscanf.o.
        * libc/stdio/asiprintf.c: New file.
        * libc/stdio/fiscanf.c: Ditto.
        * libc/stdio/iscanf.c: Ditto.
        * libc/stdio/sccl.c: Ditto.
        * libc/stdio/siscanf.c: Ditto.
        * libc/stdio/vasiprintf.c: Ditto.
        * libc/stdio/viprintf.c: Ditto.
        * libc/stdio/viscanf.c: Ditto.
        * libc/stdio/vsiprintf.c: Ditto.
        * libc/stdio/vsiscanf.c: Ditto.
        * libc/stdio/vsniprintf.c: Ditto.

1 files changed, 139 insertions, 0 deletions

diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
new file mode 100644
index 000000000..15388a404
--- /dev/null
+++ b/newlib/libc/stdio/viscanf.c
@@ -0,0 +1,139 @@
+/*-
+ * Code created by modifying iscanf.c which has following copyright.
+ *
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/*
+FUNCTION
+<<viscanf>>, <<vfiscanf>>, <<vsiscanf>>---format argument list
+
+INDEX
+	viscanf
+INDEX
+	vfiscanf
+INDEX
+	vsiscanf
+
+ANSI_SYNOPSIS
+	#include <stdio.h>
+	#include <stdarg.h>
+	int viscanf(const char *<[fmt]>, va_list <[list]>);
+	int vfiscanf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
+	int vsiscanf(const char *<[str]>, const char *<[fmt]>, va_list <[list]>);
+
+	int _viscanf_r(struct _reent *<[reent]>, const char *<[fmt]>, 
+                       va_list <[list]>);
+	int _vfiscanf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
+                       va_list <[list]>);
+	int _vsiscanf_r(struct _reent *<[reent]>, const char *<[str]>, const char *<[fmt]>, 
+                       va_list <[list]>);
+
+TRAD_SYNOPSIS
+	#include <stdio.h>
+	#include <varargs.h>
+	int viscanf( <[fmt]>, <[ist]>)
+	char *<[fmt]>;
+	va_list <[list]>;
+
+	int vfiscanf( <[fp]>, <[fmt]>, <[list]>)
+	FILE *<[fp]>;
+	char *<[fmt]>;
+	va_list <[list]>;
+	
+	int vsiscanf( <[str]>, <[fmt]>, <[list]>)
+	char *<[str]>;
+	char *<[fmt]>;
+	va_list <[list]>;
+
+	int _viscanf_r( <[reent]>, <[fmt]>, <[ist]>)
+	struct _reent *<[reent]>;
+	char *<[fmt]>;
+	va_list <[list]>;
+
+	int _vfiscanf_r( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
+	struct _reent *<[reent]>;
+	FILE *<[fp]>;
+	char *<[fmt]>;
+	va_list <[list]>;
+	
+	int _vsiscanf_r( <[reent]>, <[str]>, <[fmt]>, <[list]>)
+	struct _reent *<[reent]>;
+	char *<[str]>;
+	char *<[fmt]>;
+	va_list <[list]>;
+
+DESCRIPTION
+<<viscanf>>, <<vfiscanf>>, and <<vsiscanf>> are (respectively) variants
+of <<iscanf>>, <<fiscanf>>, and <<siscanf>>.  They differ only in 
+allowing their caller to pass the variable argument list as a 
+<<va_list>> object (initialized by <<va_start>>) rather than 
+directly accepting a variable number of arguments.
+
+RETURNS
+The return values are consistent with the corresponding functions:
+<<viscanf>> returns the number of input fields successfully scanned,
+converted, and stored; the return value does not include scanned
+fields which were not stored.  
+
+If <<viscanf>> attempts to read at end-of-file, the return value 
+is <<EOF>>.
+
+If no fields were stored, the return value is <<0>>.
+
+The routines <<_viscanf_r>>, <<_vfiscanf_f>>, and <<_vsiscanf_r>> are
+reentrant versions which take an additional first parameter which points to the
+reentrancy structure.
+
+PORTABILITY
+These are newlib extensions.
+
+Supporting OS subroutines required:
+*/
+
+#include <_ansi.h>
+#include <reent.h>
+#include <stdio.h>
+#ifdef _HAVE_STDC
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include "local.h"
+
+#ifndef _REENT_ONLY
+
+int
+_DEFUN(viscanf, (fmt, ap), 
+       _CONST char *fmt _AND 
+       va_list ap)
+{
+  _REENT_SMALL_CHECK_INIT (_stdin_r (_REENT));
+  return __svfiscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
+}
+
+#endif /* !_REENT_ONLY */
+
+int
+_DEFUN(_viscanf_r, (ptr, fmt, ap),
+       struct _reent *ptr _AND 
+       _CONST char *fmt   _AND 
+       va_list ap)
+{
+  _REENT_SMALL_CHECK_INIT (_stdin_r (ptr));
+  return __svfiscanf_r (ptr, _stdin_r (ptr), fmt, ap);
+}
+