From a529b416204403526663696b3dd9fbd567937b9b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 7 Aug 2001 04:37:18 +0000 Subject: Update. 2001-08-06 Jakub Jelinek * stdlib/strtod.c (STRTOF): Skip whole infinity, not just inf. * stdio-common/vfscanf.c (__vfscanf): +- can be followed by i in +-Inf. * stdlib/tst-strtod.c (tests): Add Inf tests. * stdio-common/tstscanf.c (main): Add tests for +- before Inf. * locale/weightwc.h (findidx): Change type of i to int32_t. --- stdio-common/tstscanf.c | 20 ++++++++++++++++++++ stdio-common/vfscanf.c | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'stdio-common') diff --git a/stdio-common/tstscanf.c b/stdio-common/tstscanf.c index dc02acc..44ddf49 100644 --- a/stdio-common/tstscanf.c +++ b/stdio-common/tstscanf.c @@ -21,6 +21,7 @@ #else #include #endif +#include #include #include @@ -331,6 +332,25 @@ main (int argc, char **argv) } } + fputs ("Test 13:\n", stdout); + { + float value; + int res; + + res = sscanf ("-InF", "%f", &value); + if (res != 1 || isinf (value) != -1) + { + fputs ("test failed!\n", stdout); + result = 1; + } + + res = sscanf ("+InfiNiTY", "%f", &value); + if (res != 1 || isinf (value) != 1) + { + fputs ("test failed!\n", stdout); + result = 1; + } + } return result; } diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 9809ea3..aa0f091 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -1604,7 +1604,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) if (width == 0 || inchar () == EOF) /* EOF is only an input error before we read any chars. */ conv_error (); - if (! ISDIGIT (c)) + if (! ISDIGIT (c) && TOLOWER (c) != L_('i')) { #ifdef COMPILE_WSCANF if (c != decimal) -- cgit v1.1