Fixed EOF handling.

[pdclib] / functions / stdio / vfscanf.c

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index a9ce3e96e1e6fa3bb6a43aa80357a58a66110a07..8f121e95e4a73cac03d000cf6a96132e2163e5ab 100644 (file)
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -42,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 );
                 }
@@ -50,10 +50,13 @@ 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 ) ) /* TODO: Check EOF status directly */
+                    {
+                        ungetc( c, stream );
+                    }
                     return status.n;
                 }
                 else
@@ -83,11 +86,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 )
 {
-    /* TODO: Check whitespace / EOF / ungetc handling */
-    TESTCASE( NO_TESTDRIVER );
+#include "fscan_sources.incl"
+#include "scanf_testcases.incl"
     return TEST_RESULTS;
 }
 
 #endif
+