X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsscanf.c;h=4300a3eb4d9b10720cd5c702f95fed28e8702911;hb=2612fba05258dfde899375db0aa88e65c337395d;hp=5126bae9ec7349aa38b8bcaf5e2bab453ca9051d;hpb=1dc65b44756ab69d515590758f0238cc6144b663;p=fw%2Fpdclib

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 5126bae..4300a3e 100644
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -14,17 +14,19 @@
 
 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;
     status.base = 0;
     status.flags = 0;
-    status.n = 0; 
+    status.n = 0;
     status.i = 0;
-    status.this = 0;
-    status.s = (char *)s;
+    status.current = 0;
+    status.s = (char *) s;
     status.width = 0;
     status.prec = 0;
     status.stream = NULL;
     va_copy( status.arg, arg );
+
     while ( *format != '\0' )
     {
         const char * rc;
@@ -46,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;
                 }
@@ -59,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 */
@@ -75,22 +86,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;
 }