-/* $Id$ */
-
-/* vsscanf( const char *, const char *, va_list arg )
+/* vsscanf( const char *, const char *, va_list )
This file is part of the Public Domain C Library (PDCLib).
Permission is granted to use, modify, and / or redistribute at will.
#ifndef REGTEST
#include <ctype.h>
+#include "_PDCLIB_io.h"
-int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
+int vsscanf( const char * _PDCLIB_restrict s,
+ const char * _PDCLIB_restrict format,
+ va_list arg )
{
/* TODO: This function should interpret format as multibyte characters. */
struct _PDCLIB_status_t status;
/* Non-whitespace char in format string: Match verbatim */
if ( *status.s != *format )
{
+ if ( *status.s == '\0' && status.n == 0 )
+ {
+ /* Early input error */
+ return EOF;
+ }
/* Matching error */
return status.n;
}
}
else
{
- /* NULL return code indicates input error */
+ /* NULL return code indicates error */
if ( rc == NULL )
{
+ if ( ( *status.s == '\n' ) && ( status.n == 0 ) )
+ {
+ status.n = EOF;
+ }
break;
}
/* Continue parsing after conversion specifier */
#endif
#ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vsscanf.c"
+#define _PDCLIB_STRINGIO
-#include "scan_test.h"
+#include "_PDCLIB_test.h"
-static int SCANFUNC( char const * stream, char const * format, ... )
+static int testscanf( char const * stream, char const * format, ... )
{
va_list ap;
va_start( ap, format );
int main( void )
{
-#include "sscan_sources.incl"
-#include "scanf_testcases.incl"
+ char source[100];
+#include "scanf_testcases.h"
return TEST_RESULTS;
}