Copy & paste error having sscanf code in there. Fixed.

[pdclib] / functions / stdio / vfscanf.c

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 1cfea645fa168c2713da25c82f9ea86d41b0d42d..bf09226c16edb26b77e1b4355f064e236afbec40 100644 (file)
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* vfscanf( FILE *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,13 +8,73 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <ctype.h>
 
 #ifndef REGTEST
 
 int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
 {
-    /* TODO: Implement using vsscanf() reading from file buffer */
-    return 0;
+    struct _PDCLIB_status_t status;
+    status.base = 0;
+    status.flags = 0;
+    status.n = 0; 
+    status.i = 0;
+    status.current = 0;
+    status.s = NULL;
+    status.width = 0;
+    status.prec = 0;
+    status.stream = stream;
+    // = { 0, 0, 0, 0, 0, NULL, 0, 0, stream }
+    va_copy( status.arg, arg );
+    while ( *format != '\0' )
+    {
+        const char * rc;
+        if ( ( *format != '%' ) || ( ( rc = _PDCLIB_scan( format, &status ) ) == format ) )
+        {
+            int c;
+            /* No conversion specifier, match verbatim */
+            if ( isspace( *format ) )
+            {
+                /* Whitespace char in format string: Skip all whitespaces */
+                /* No whitespaces in input does not result in matching error */
+                while ( isspace( c = getc( stream ) ) )
+                {
+                    ++status.i;
+                }
+                if ( c != EOF )
+                {
+                    ungetc( c, stream );
+                }
+            }
+            else
+            {
+                /* Non-whitespace char in format string: Match verbatim */
+                if ( ( c = getc( stream ) ) != *format )
+                {
+                    /* Matching error */
+                    ungetc( c, stream );
+                    return status.n;
+                }
+                else
+                {
+                    ++status.i;
+                }
+            }
+            ++format;
+        }
+        else
+        {
+            /* NULL return code indicates matching error */
+            if ( rc == NULL )
+            {
+                break;
+            }
+            /* Continue parsing after conversion specifier */
+            format = rc;
+        }
+    }
+    va_end( status.arg );
+    return status.n;
 }
 
 #endif
@@ -26,6 +84,7 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
 
 int main( void )
 {
+    /* TODO: Check whitespace / EOF / ungetc handling */
     TESTCASE( NO_TESTDRIVER );
     return TEST_RESULTS;
 }