X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=bd5a68121bb1b1a56de023428b542d921e68c252;hb=b5b6c4a890795ea76f9b92b817b0a83c6bb4862c;hp=99a752ff2db0258fc8ccc67d47faae2162f3e5ac;hpb=48086f5fbd3649c43a555d69a9374863dbee921b;p=pdclib.old

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 99a752f..bd5a681 100644
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -11,8 +11,11 @@
 #include <ctype.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
+int _PDCLIB_vfscanf_unlocked( 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;
@@ -42,18 +45,25 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
                 {
                     ++status.i;
                 }
-                if ( c != EOF )
+                if ( ! feof( stream ) )
                 {
-                    ungetc( c, stream );
+                    _PDCLIB_ungetc_unlocked( c, stream );
                 }
             }
             else
             {
                 /* Non-whitespace char in format string: Match verbatim */
-                if ( ( c = getc( stream ) ) != *format )
+                if ( ( ( c = _PDCLIB_getc_unlocked( stream ) ) != *format ) || feof( stream ) )
                 {
                     /* Matching error */
-                    ungetc( c, stream );
+                    if ( ! feof( stream ) && ! ferror( stream ) )
+                    {
+                        _PDCLIB_ungetc_unlocked( c, stream );
+                    }
+                    else if ( status.n == 0 )
+                    {
+                        return EOF;
+                    }
                     return status.n;
                 }
                 else
@@ -78,14 +88,25 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
     return status.n;
 }
 
+int vfscanf( FILE * _PDCLIB_restrict stream, 
+             const char * _PDCLIB_restrict format, 
+             va_list arg )
+{
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_vfscanf_unlocked( stream, format, arg );
+    _PDCLIB_funlockfile( stream );
+    return r;
+}
+
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vfscanf.c"
+#define _PDCLIB_FILEIO
 
-#include "scan_test.h"
+#include <_PDCLIB_test.h>
 
-static int SCANFUNC( FILE * stream, char const * format, ... )
+static int testscanf( FILE * stream, char const * format, ... )
 {
     va_list ap;
     va_start( ap, format );
@@ -96,8 +117,10 @@ static int SCANFUNC( FILE * stream, char const * format, ... )
 
 int main( void )
 {
-#include "fscan_sources.incl"
-#include "scanf_testcases.incl"
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
     return TEST_RESULTS;
 }