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, 19 insertions, 112 deletions

diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index f13181af7..9e04e2b71 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -119,9 +119,20 @@ Supporting OS subroutines required:
 #endif
 #include "local.h"
 
-#ifndef	NO_FLOATING_POINT
+#ifdef INTEGER_ONLY
+#define VFSCANF vfiscanf
+#define _VFSCANF_R _vfiscanf_r
+#define __SVFSCANF __svfiscanf
+#define __SVFSCANF_R __svfiscanf_r
+#else
+#define VFSCANF vfscanf
+#define _VFSCANF_R _vfscanf_r
+#define __SVFSCANF __svfscanf
+#define __SVFSCANF_R __svfscanf_r
+#ifndef NO_FLOATING_POINT
 #define FLOATING_POINT
 #endif
+#endif
 
 #ifdef FLOATING_POINT
 #include <float.h>
@@ -214,39 +225,39 @@ typedef unsigned long long u_long_long;
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vfscanf, (fp, fmt, ap), 
+_DEFUN(VFSCANF, (fp, fmt, ap), 
        register FILE *fp _AND 
        _CONST char *fmt _AND 
        va_list ap)
 {
   CHECK_INIT(fp);
-  return __svfscanf_r (_REENT, fp, fmt, ap);
+  return __SVFSCANF_R (_REENT, fp, fmt, ap);
 }
 
 int
-_DEFUN(__svfscanf, (fp, fmt0, ap),
+_DEFUN(__SVFSCANF, (fp, fmt0, ap),
        register FILE *fp _AND
        char _CONST *fmt0 _AND
        va_list ap)
 {
-  return __svfscanf_r (_REENT, fp, fmt0, ap);
+  return __SVFSCANF_R (_REENT, fp, fmt0, ap);
 }
 
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vfscanf_r, (data, fp, fmt, ap),
+_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
        struct _reent *data _AND 
        register FILE *fp   _AND 
        _CONST char *fmt    _AND 
        va_list ap)
 {
-  return __svfscanf_r (data, fp, fmt, ap);
+  return __SVFSCANF_R (data, fp, fmt, ap);
 }
 
 
 int
-_DEFUN(__svfscanf_r, (rptr, fp, fmt0, ap),
+_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
        struct _reent *rptr _AND
        register FILE *fp   _AND
        char _CONST *fmt0   _AND
@@ -1169,107 +1180,3 @@ all_done:
   _funlockfile (fp);
   return nassigned;
 }
-
-/*
- * Fill in the given table from the scanset at the given format
- * (just after `[').  Return a pointer to the character past the
- * closing `]'.  The table has a 1 wherever characters should be
- * considered part of the scanset.
- */
-
-/*static*/
-u_char *
-_DEFUN(__sccl, (tab, fmt),
-       register char *tab _AND
-       register u_char *fmt)
-{
-  register int c, n, v;
-
-  /* first `clear' the whole table */
-  c = *fmt++;			/* first char hat => negated scanset */
-  if (c == '^')
-    {
-      v = 1;			/* default => accept */
-      c = *fmt++;		/* get new first char */
-    }
-  else
-    v = 0;			/* default => reject */
-  /* should probably use memset here */
-  for (n = 0; n < 256; n++)
-    tab[n] = v;
-  if (c == 0)
-    return fmt - 1;		/* format ended before closing ] */
-
-  /*
-   * Now set the entries corresponding to the actual scanset to the
-   * opposite of the above.
-   *
-   * The first character may be ']' (or '-') without being special; the
-   * last character may be '-'.
-   */
-
-  v = 1 - v;
-  for (;;)
-    {
-      tab[c] = v;		/* take character c */
-    doswitch:
-      n = *fmt++;		/* and examine the next */
-      switch (n)
-	{
-
-	case 0:		/* format ended too soon */
-	  return fmt - 1;
-
-	case '-':
-	  /*
-	   * A scanset of the form [01+-] is defined as `the digit 0, the
-	   * digit 1, the character +, the character -', but the effect of a
-	   * scanset such as [a-zA-Z0-9] is implementation defined.  The V7
-	   * Unix scanf treats `a-z' as `the letters a through z', but treats
-	   * `a-a' as `the letter a, the character -, and the letter a'.
-	   *
-	   * For compatibility, the `-' is not considerd to define a range if
-	   * the character following it is either a close bracket (required by
-	   * ANSI) or is not numerically greater than the character we just
-	   * stored in the table (c).
-	   */
-	  n = *fmt;
-	  if (n == ']' || n < c)
-	    {
-	      c = '-';
-	      break;		/* resume the for(;;) */
-	    }
-	  fmt++;
-	  do
-	    {			/* fill in the range */
-	      tab[++c] = v;
-	    }
-	  while (c < n);
-#if 1			/* XXX another disgusting compatibility hack */
-	  /*
-	   * Alas, the V7 Unix scanf also treats formats such
-	   * as [a-c-e] as `the letters a through e'. This too
-	   * is permitted by the standard....
-	   */
-	  goto doswitch;
-#else
-	  c = *fmt++;
-	  if (c == 0)
-	    return fmt - 1;
-	  if (c == ']')
-	    return fmt;
-#endif
-
-	  break;
-
-
-	case ']':		/* end of scanset */
-	  return fmt;
-
-	default:		/* just another character */
-	  c = n;
-	  break;
-	}
-    }
-  /* NOTREACHED */
-}