X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsscanf.c;h=29dd4838b6d56ccf6103fdc46d136b059892e9c0;hb=HEAD;hp=3fc09cf3cdb2c04b1eef171f704e7e4657b4c2e1;hpb=b4a6c6d955cfe2bfccb98feeecdb014f7033ed23;p=pdclib.old

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 3fc09cf..29dd483 100644
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -11,8 +11,11 @@
 
 #ifndef REGTEST
 #include <ctype.h>
+#include <_PDCLIB_io.h>
 
-int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
+int vsscanf( const char * _PDCLIB_restrict s, 
+             const char * _PDCLIB_restrict format, 
+             va_list arg )
 {
     /* TODO: This function should interpret format as multibyte characters.  */
     struct _PDCLIB_status_t status;
@@ -48,6 +51,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 +69,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,22 +89,24 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/vsscanf.c"
+#define _PDCLIB_STRINGIO
+
 #include <_PDCLIB_test.h>
 
+static int testscanf( char const * stream, char const * format, ... )
+{
+    va_list ap;
+    va_start( ap, format );
+    int result = vsscanf( stream, format, ap );
+    va_end( ap );
+    return result;
+}
+
 int main( void )
 {
-    char const * teststring1 = "abc  def";
-    char const * teststring2 = "abcdef";
-    char const * teststring3 = "abc%def";
-    int x;
-    TESTCASE( sscanf( teststring2, "abcdef%n", &x ) == 0 );
-    TESTCASE( x == 6 );
-    TESTCASE( sscanf( teststring1, "abc def%n", &x ) == 0 );
-    TESTCASE( x == 8 );
-    TESTCASE( sscanf( teststring2, "abc def%n", &x ) == 0 );
-    TESTCASE( x == 6 );
-    TESTCASE( sscanf( teststring3, "abc%%def%n", &x ) == 0 );
-    TESTCASE( x == 7 );
+    char source[100];
+#include "scanf_testcases.h"
     return TEST_RESULTS;
 }