X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=d70f5d5c92bbfcec9069412d4f12c0c1c09b2291;hb=2f13296a39de23e7ea4cdda37f13ff214147c6be;hp=a9ce3e96e1e6fa3bb6a43aa80357a58a66110a07;hpb=3c60673fd7479218b6f8069b848a1f5c2bd10114;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index a9ce3e9..d70f5d5 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).
@@ -23,7 +21,7 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
     status.current = 0;
     status.s = NULL;
     status.width = 0;
-    status.prec = 0;
+    status.prec = EOF;
     status.stream = stream;
     va_copy( status.arg, arg );
 
@@ -42,7 +40,7 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
                 {
                     ++status.i;
                 }
-                if ( c != EOF )
+                if ( ! feof( stream ) )
                 {
                     ungetc( c, stream );
                 }
@@ -50,10 +48,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 ) )
                 {
                     /* Matching error */
-                    ungetc( c, stream );
+                    if ( ! feof( stream ) && ! ferror( stream ) )
+                    {
+                        ungetc( c, stream );
+                    }
+                    else if ( status.n == 0 )
+                    {
+                        return EOF;
+                    }
                     return status.n;
                 }
                 else
@@ -81,12 +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 )
 {
-    /* 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;
 }