Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 8a2379026af56d13040fff21589cc8247bc365ff..4300a3eb4d9b10720cd5c702f95fed28e8702911 100644 (file)
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -48,6 +48,11 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
                 /* Non-whitespace char in format string: Match verbatim */
                 if ( *status.s != *format )
                 {
+                    if ( *status.s == '\0' && status.n == 0 )
+                    {
+                        /* Early input error */
+                        return EOF;
+                    }
                     /* Matching error */
                     return status.n;
                 }
@@ -61,9 +66,13 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
         }
         else
         {
-            /* NULL return code indicates input error */
+            /* NULL return code indicates error */
             if ( rc == NULL )
             {
+                if ( ( *status.s == '\n' ) && ( status.n == 0 ) )
+                {
+                    status.n = EOF;
+                }
                 break;
             }
             /* Continue parsing after conversion specifier */
@@ -77,11 +86,12 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vsscanf.c"
+#define _PDCLIB_STRINGIO
 
-#include "scan_test.h"
+#include <_PDCLIB_test.h>
 
-static int SCANFUNC( char const * stream, char const * format, ... )
+static int testscanf( char const * stream, char const * format, ... )
 {
     va_list ap;
     va_start( ap, format );
@@ -92,8 +102,8 @@ static int SCANFUNC( char const * stream, char const * format, ... )
 
 int main( void )
 {
-#include "sscan_sources.incl"
-#include "scanf_testcases.incl"
+    char source[100];
+#include "scanf_testcases.h"
     return TEST_RESULTS;
 }