X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=a19f18ef13e6fc9233572dd735da66d419ceb4be;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=eda4226988d9c2b6222f624a613563331790accd;hpb=0b5f84a52cf54e88b99a44efc6f5f2c46e9b294d;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index eda4226..a19f18e 100644
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* vfscanf( FILE *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -14,44 +12,57 @@
 
 int vfscanf( FILE * _PDCLIB_restrict stream, 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.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 do not result in matching error */
-                while ( isspace( *status.s ) )
+                /* No whitespaces in input does not result in matching error */
+                while ( isspace( c = getc( stream ) ) )
                 {
-                    ++status.s;
                     ++status.i;
                 }
+                if ( ! feof( stream ) )
+                {
+                    ungetc( c, stream );
+                }
             }
             else
             {
                 /* Non-whitespace char in format string: Match verbatim */
-                if ( *status.s != *format )
+                if ( ( ( c = getc( stream ) ) != *format ) || feof( stream ) )
                 {
                     /* Matching error */
+                    if ( ! feof( stream ) && ! ferror( stream ) )
+                    {
+                        ungetc( c, stream );
+                    }
+                    else if ( status.n == 0 )
+                    {
+                        return EOF;
+                    }
                     return status.n;
                 }
                 else
                 {
-                    ++status.s;
                     ++status.i;
                 }
             }
@@ -59,6 +70,11 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
         }
         else
         {
+            /* NULL return code indicates matching error */
+            if ( rc == NULL )
+            {
+                break;
+            }
             /* Continue parsing after conversion specifier */
             format = rc;
         }
@@ -70,11 +86,26 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vfscanf.c"
+#define _PDCLIB_FILEIO
+
+#include "_PDCLIB_test.h"
+
+static int testscanf( 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 );
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
     return TEST_RESULTS;
 }