X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=fbf5356d78673667b741fca010ea4af5cfc9adbe;hb=a7a8d2f1c85c2d7760d4d3479e90466cc3a81b04;hp=16ea59283ef520755a1fecf6b31e18b4ef48febe;hpb=268c42b566c2be8deaf4c9c8571d3d2e23bae92d;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 16ea592..fbf5356 100644
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -14,9 +14,19 @@
 
 int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
 {
-    /* base, flags, n, i, current, s, width, prec, stream, arg */
-    struct _PDCLIB_status_t status = { 0, 0, 0, 0, 0, NULL, 0, 0, stream, NULL };
+    /* 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;
@@ -32,7 +42,7 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
                 {
                     ++status.i;
                 }
-                if ( c != EOF )
+                if ( ! feof( stream ) ) /* TODO: Check EOF status directly */
                 {
                     ungetc( c, stream );
                 }
@@ -40,10 +50,17 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
             else
             {
                 /* Non-whitespace char in format string: Match verbatim */
-                if ( ( c = getc( stream ) ) != *format )
+                if ( ( ( c = getc( stream ) ) != *format ) || feof( stream ) ) /* TODO: Check EOF status directly */
                 {
                     /* Matching error */
-                    ungetc( c, stream );
+                    if ( ! feof( stream ) && ! ferror( stream ) ) /* TODO: Check EOF status directly */
+                    {
+                        ungetc( c, stream );
+                    }
+                    else if ( status.n == 0 )
+                    {
+                        return EOF;
+                    }
                     return status.n;
                 }
                 else
@@ -71,13 +88,28 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
 #endif
 
 #ifdef TEST
+#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 )
 {
-    /* TODO: Check whitespace / EOF / ungetc handling */
-    TESTCASE( NO_TESTDRIVER );
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+