diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/strtod_l.c | 22 | ||||
| -rw-r--r-- | stdlib/tst-strtod2.c | 41 |
2 files changed, 46 insertions, 17 deletions
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c index b4e4819c87..397fd7077e 100644 --- a/stdlib/strtod_l.c +++ b/stdlib/strtod_l.c @@ -1,5 +1,6 @@ /* Convert string representing a number to float value, using given locale. - Copyright (C) 1997,1998,2002,2004,2005,2006 Free Software Foundation, Inc. + Copyright (C) 1997,1998,2002,2004,2005,2006,2007 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -665,14 +666,23 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) if (!((c >= L_('0') && c <= L_('9')) || (base == 16 && ((CHAR_TYPE) TOLOWER (c) >= L_('a') && (CHAR_TYPE) TOLOWER (c) <= L_('f'))) + || ( #ifdef USE_WIDE_CHAR - || c == (wint_t) decimal + c == (wint_t) decimal #else - || ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt) - if (decimal[cnt] != cp[cnt]) - break; - decimal[cnt] == '\0'; }) + ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt) + if (decimal[cnt] != cp[cnt]) + break; + decimal[cnt] == '\0'; }) #endif + /* '0x.' alone is not a valid hexadecimal number. + '.' alone is not valid either, but that has been checked + already earlier. */ + && (base != 16 + || cp != start_of_digits + || (cp[decimal_len] >= L_('0') && cp[decimal_len] <= L_('9')) + || ((CHAR_TYPE) TOLOWER (cp[decimal_len]) >= L_('a') + && (CHAR_TYPE) TOLOWER (cp[decimal_len]) <= L_('f')))) || (base == 16 && (cp != start_of_digits && (CHAR_TYPE) TOLOWER (c) == L_('p'))) || (base != 16 && (CHAR_TYPE) TOLOWER (c) == L_('e')))) diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c index 925ea9cafa..30d8d9df65 100644 --- a/stdlib/tst-strtod2.c +++ b/stdlib/tst-strtod2.c @@ -1,22 +1,41 @@ #include <stdio.h> #include <stdlib.h> +struct test +{ + const char *str; + double result; + size_t offset; +} tests[] = +{ + { "0xy", 0.0, 1 }, + { "0x.y", 0.0, 1 }, + { "0x0.y", 0.0, 4 }, + { "0x.0y", 0.0, 4 }, + { ".y", 0.0, 0 }, + { "0.y", 0.0, 2 }, + { ".0y", 0.0, 2 } +}; + static int do_test (void) { int status = 0; - const char s[] = "0x"; - char *ep; - double r = strtod (s, &ep); - if (r != 0) - { - printf ("r = %g, expect 0\n", r); - status = 1; - } - if (ep != s + 1) + for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i) { - printf ("strtod parsed %ju characters, expected 1\n", ep - s); - status = 1; + char *ep; + double r = strtod (tests[i].str, &ep); + if (r != tests[i].result) + { + printf ("test %zu r = %g, expect %g\n", i, r, tests[i].result); + status = 1; + } + if (ep != tests[i].str + tests[i].offset) + { + printf ("test %zu strtod parsed %ju characters, expected %zu\n", + i, ep - tests[i].str, tests[i].offset); + status = 1; + } } return status; } |