X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fstdio%2Fvfscanf.c;h=e9aa01002e21d687294fac4443a339bba0fe4d2d;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hp=e1c8b4b40efd8fd28040cbf47600647ab0e9e4bb;hpb=00379f785fe102b41c75761d4c1f2a1dbb8d1fde;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index e1c8b4b..e9aa010 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).
@@ -11,8 +9,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,20 +43,20 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
                 {
                     ++status.i;
                 }
-                if ( ! feof( stream ) ) /* TODO: Check EOF status directly */
+                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 ) || feof( stream ) ) /* TODO: Check EOF status directly */
+                if ( ( ( c = _PDCLIB_getc_unlocked( stream ) ) != *format ) || feof( stream ) )
                 {
                     /* Matching error */
-                    if ( ! feof( stream ) && ! ferror( stream ) ) /* TODO: Check EOF status directly */
+                    if ( ! feof( stream ) && ! ferror( stream ) )
                     {
-                        ungetc( c, stream );
+                        _PDCLIB_ungetc_unlocked( c, stream );
                     }
                     else if ( status.n == 0 )
                     {
@@ -85,14 +86,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 );
@@ -103,8 +115,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;
 }