/* 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 */
#ifdef TEST
#include <_PDCLIB_test.h>
+#include "scan_test.h"
+
+static int SCANFUNC( char const * stream, char const * format, ... )
+{
+ va_list ap;
+ va_start( ap, format );
+ int result = vsscanf( stream, format, ap );
+ va_end( ap );
+ return result;
+}
+
int main( void )
{
- char const * teststring1 = "abc def";
- char const * teststring2 = "abcdef";
- char const * teststring3 = "abc%def";
- int x;
- TESTCASE( sscanf( teststring2, "abcdef%n", &x ) == 0 );
- TESTCASE( x == 6 );
- TESTCASE( sscanf( teststring1, "abc def%n", &x ) == 0 );
- TESTCASE( x == 8 );
- TESTCASE( sscanf( teststring2, "abc def%n", &x ) == 0 );
- TESTCASE( x == 6 );
- TESTCASE( sscanf( teststring3, "abc%%def%n", &x ) == 0 );
- TESTCASE( x == 7 );
+#include "sscan_sources.incl"
+#include "scanf_testcases.incl"
return TEST_RESULTS;
}