X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsscanf.c;h=a9076d0291e4030a0f58798a3d9824f5aaad374e;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=8a2379026af56d13040fff21589cc8247bc365ff;hpb=f56f5d756f412e9c7058e2af4e36bc1de21dd642;p=pdclib

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 8a23790..a9076d0 100644
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -1,6 +1,4 @@
-/* $Id$ */
-
-/* vsscanf( const char *, const char *, va_list arg )
+/* vsscanf( const char *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
@@ -8,9 +6,9 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <ctype.h>
 
 #ifndef REGTEST
-#include <ctype.h>
 
 int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
 {
@@ -48,6 +46,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 +64,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 +84,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 +100,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;
 }