#ifndef REGTEST
-int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
+int vfscanf_unlocked( 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;
{
++status.i;
}
- if ( c != EOF )
+ if ( ! feof( stream ) )
{
ungetc( c, stream );
}
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
return status.n;
}
+int vfscanf( FILE * _PDCLIB_restrict stream,
+ const char * _PDCLIB_restrict format,
+ va_list arg )
+{
+ flockfile( stream );
+ int r = vfscanf_unlocked( stream, format, arg );
+ funlockfile( stream );
+ return r;
+}
+
#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
+