X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=99a752ff2db0258fc8ccc67d47faae2162f3e5ac;hb=f56f5d756f412e9c7058e2af4e36bc1de21dd642;hp=1cfea645fa168c2713da25c82f9ea86d41b0d42d;hpb=d02f38605b53cdff5460cc6b9e1b2a80c3a2ba4c;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 1cfea64..99a752f 100644
--- 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,74 @@
 
 #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;
+    /* 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 = NULL;
+    status.width = 0;
+    status.prec = 0;
+    status.stream = 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
@@ -24,10 +83,23 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include "scan_test.h"
+
+static int SCANFUNC( FILE * stream, char const * format, ... )
+{
+    va_list ap;
+    va_start( ap, format );
+    int result = vfscanf( stream, format, ap );
+    va_end( ap );
+    return result;
+}
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+#include "fscan_sources.incl"
+#include "scanf_testcases.incl"
     return TEST_RESULTS;
 }
 
 #endif
+