projects
/
fw
/
pdclib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*Much* better.
[fw/pdclib]
/
functions
/
stdio
/
vfscanf.c
diff --git
a/functions/stdio/vfscanf.c
b/functions/stdio/vfscanf.c
index eda4226988d9c2b6222f624a613563331790accd..e1c8b4b40efd8fd28040cbf47600647ab0e9e4bb 100644
(file)
--- a/
functions/stdio/vfscanf.c
+++ b/
functions/stdio/vfscanf.c
@@
-14,44
+14,57
@@
int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
{
int vfscanf( 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;
status.base = 0;
status.flags = 0;
struct _PDCLIB_status_t status;
status.base = 0;
status.flags = 0;
- status.n = 0;
+ status.n = 0;
status.i = 0;
status.i = 0;
- status.
this
= 0;
+ status.
current
= 0;
status.s = NULL;
status.width = 0;
status.prec = 0;
status.stream = stream;
va_copy( status.arg, arg );
status.s = NULL;
status.width = 0;
status.prec = 0;
status.stream = stream;
va_copy( status.arg, arg );
+
while ( *format != '\0' )
{
const char * rc;
if ( ( *format != '%' ) || ( ( rc = _PDCLIB_scan( format, &status ) ) == format ) )
{
while ( *format != '\0' )
{
const char * rc;
if ( ( *format != '%' ) || ( ( rc = _PDCLIB_scan( format, &status ) ) == format ) )
{
+ int c;
/* No conversion specifier, match verbatim */
if ( isspace( *format ) )
{
/* Whitespace char in format string: Skip all whitespaces */
/* No conversion specifier, match verbatim */
if ( isspace( *format ) )
{
/* Whitespace char in format string: Skip all whitespaces */
- /* No whitespaces in input do not result in matching error */
- while ( isspace(
*status.s
) )
+ /* No whitespaces in input do
es
not result in matching error */
+ while ( isspace(
c = getc( stream )
) )
{
{
- ++status.s;
++status.i;
}
++status.i;
}
+ if ( ! feof( stream ) ) /* TODO: Check EOF status directly */
+ {
+ ungetc( c, stream );
+ }
}
else
{
/* Non-whitespace char in format string: Match verbatim */
}
else
{
/* Non-whitespace char in format string: Match verbatim */
- if (
*status.s != *format )
+ if (
( ( c = getc( stream ) ) != *format ) || feof( stream ) ) /* TODO: Check EOF status directly */
{
/* Matching error */
{
/* Matching error */
+ if ( ! feof( stream ) && ! ferror( stream ) ) /* TODO: Check EOF status directly */
+ {
+ ungetc( c, stream );
+ }
+ else if ( status.n == 0 )
+ {
+ return EOF;
+ }
return status.n;
}
else
{
return status.n;
}
else
{
- ++status.s;
++status.i;
}
}
++status.i;
}
}
@@
-59,6
+72,11
@@
int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
}
else
{
}
else
{
+ /* NULL return code indicates matching error */
+ if ( rc == NULL )
+ {
+ break;
+ }
/* Continue parsing after conversion specifier */
format = rc;
}
/* Continue parsing after conversion specifier */
format = rc;
}
@@
-72,10
+90,23
@@
int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
#ifdef TEST
#include <_PDCLIB_test.h>
#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 )
{
int main( void )
{
- TESTCASE( NO_TESTDRIVER );
+#include "fscan_sources.incl"
+#include "scanf_testcases.incl"
return TEST_RESULTS;
}
#endif
return TEST_RESULTS;
}
#endif
+