Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/scanf.c b/functions/stdio/scanf.c
index 612f151c17551d010ac5698c513bd266f81314c5..41501bc0a735c5b77c3ddf04b8f919e13fd377d5 100644 (file)
--- a/functions/stdio/scanf.c
+++ b/functions/stdio/scanf.c
@@ -1,20 +1,41 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-int scanf( const char * restrict format, ... ) { /* TODO */ };
+/* scanf( const char *, ... )
 
-/* PDPC code - unreviewed
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#ifndef REGTEST
+
+int scanf( const char * _PDCLIB_restrict format, ... )
 {
-    va_list arg;
-    int ret;
+    va_list ap;
+    va_start( ap, format );
+    return vfscanf( stdin, format, ap );
+}
+
+#endif
 
-    va_start(arg, format);
-    ret = vvscanf(format, arg, stdin, NULL);
-    va_end(arg);
-    return (ret);
+#ifdef TEST
+#define _PDCLIB_FILEID "stdio/scanf.c"
+#define _PDCLIB_FILEIO
+
+#include <_PDCLIB_test.h>
+
+#define testscanf( stream, format, ... ) scanf( format, __VA_ARGS__ )
+
+int main( void )
+{
+    FILE * source;
+    TESTCASE( ( source = freopen( testfile, "wb+", stdin ) ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
+    return TEST_RESULTS;
 }
-*/
+
+#endif