Reworked scanf() testing. General cleanups.

[fw/pdclib] / functions / stdio / fscanf.c

diff --git a/functions/stdio/fscanf.c b/functions/stdio/fscanf.c
index 05a9a1a923aecdfd71adeb50f7db7d87c5d69e59..6c0c70b10e7ee2c1f7789666ac835c90a45ed24c 100644 (file)
--- a/functions/stdio/fscanf.c
+++ b/functions/stdio/fscanf.c
@@ -1,85 +1,43 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-int fscanf( FILE * restrict stream, const char * restrict format, ... ) { /* TODO */ };
+/* fscanf( FILE *, const char *, ... )
 
-/* PDPC code - unreviewed
-{
-    va_list arg;
-    int ret;
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
 
-    va_start(arg, format);
-    ret = vvscanf(format, arg, stream, NULL);
-    va_end(arg);
-    return (ret);
-}
+#include <stdio.h>
+#include <stdarg.h>
 
-static int vvscanf(const char *format, va_list arg, FILE *fp, const char *s)
+#ifndef REGTEST
+
+int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
 {
-    int ch;
-    int fin = 0;
-    int cnt = 0;
-    char *cptr;
-    int *iptr;
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    rc = vfscanf( stream, format, ap );
+    va_end( ap );
+    return rc;
+}
+
+#endif
 
-    inch();
-    while (!fin)
-    {
-        if (*format == '\0')
-        {
-            fin = 1;
-        }
-        else if (*format == '%')
-        {
-            format++;
-            if (*format == '%')
-            {
-                if (ch != '%') return (cnt);
-                inch();
-            }
-            else if (*format == 's')
-            {
-                cptr = va_arg(arg, char *);
-                *cptr++ = (char)ch;
-                inch();
-                while ((ch >= 0) && (!isspace(ch)))
-                {
-                    *cptr++ = (char)ch;
-                    inch();
-                }
-                *cptr = '\0';
-                if (ch < 0)
-                {
-                    fin = 1;
-                }
-            }
-            else if (*format == 'd')
-            {
-                iptr = va_arg(arg, int *);
-                if (!isdigit(ch)) return (cnt);
-                *iptr = ch - '0';
-                inch();
-                while ((ch >= 0) && (isdigit(ch)))
-                {
-                    *iptr = *iptr * 10 + (ch - '0');
-                    inch();
-                }
-                if (ch < 0)
-                {
-                    fin = 1;
-                }
-            }
-        }
-        else
-        {
-            if (ch != *format) return (cnt);
-            inch();
-        }
-    }
-    return (cnt);
+#ifdef TEST
+#define _PDCLIB_FILEID "stdio/fscanf.c"
+#define _PDCLIB_FILEIO
+
+#include <_PDCLIB_test.h>
+
+#define testscanf( stream, format, ... ) fscanf( stream, format, __VA_ARGS__ )
+
+int main( void )
+{
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
+    return TEST_RESULTS;
 }
-*/
+
+#endif