Individual init to get around warnings on 64bit.

[pdclib] / functions / stdio / vsscanf.c

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 75f334d11b403b45935d81361c8baf0aa434ca00..3fc09cf3cdb2c04b1eef171f704e7e4657b4c2e1 100644 (file)
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -10,11 +10,68 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <ctype.h>
 
 int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
 {
-    /* TODO: Implement. */
-    return 0;
+    /* TODO: This function should interpret format as multibyte characters.  */
+    struct _PDCLIB_status_t status;
+    status.base = 0;
+    status.flags = 0;
+    status.n = 0;
+    status.i = 0;
+    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;
+        if ( ( *format != '%' ) || ( ( rc = _PDCLIB_scan( format, &status ) ) == format ) )
+        {
+            /* No conversion specifier, match verbatim */
+            if ( isspace( *format ) )
+            {
+                /* Whitespace char in format string: Skip all whitespaces */
+                /* No whitespaces in input do not result in matching error */
+                while ( isspace( *status.s ) )
+                {
+                    ++status.s;
+                    ++status.i;
+                }
+            }
+            else
+            {
+                /* Non-whitespace char in format string: Match verbatim */
+                if ( *status.s != *format )
+                {
+                    /* Matching error */
+                    return status.n;
+                }
+                else
+                {
+                    ++status.s;
+                    ++status.i;
+                }
+            }
+            ++format;
+        }
+        else
+        {
+            /* NULL return code indicates input error */
+            if ( rc == NULL )
+            {
+                break;
+            }
+            /* Continue parsing after conversion specifier */
+            format = rc;
+        }
+    }
+    va_end( status.arg );
+    return status.n;
 }
 
 #endif
@@ -24,7 +81,18 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
 
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    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 );
     return TEST_RESULTS;
 }