diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/Makefile | 7 | ||||
| -rw-r--r-- | stdlib/strtol_l.c | 8 | ||||
| -rw-r--r-- | stdlib/tst-strtol-locale-main.c | 87 | ||||
| -rw-r--r-- | stdlib/tst-strtol-locale.c | 25 |
4 files changed, 121 insertions, 6 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index 9e0c2495c1..e8b5b8cc1b 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -74,7 +74,8 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ tst-makecontext3 bug-getcontext bug-fmtmsg1 \ tst-secure-getenv tst-strtod-overflow tst-strtod-round \ tst-tininess tst-strtod-underflow tst-tls-atexit \ - tst-setcontext3 tst-tls-atexit-nodelete + tst-setcontext3 tst-tls-atexit-nodelete \ + tst-strtol-locale tests-static := tst-secure-getenv modules-names = tst-tls-atexit-lib @@ -122,7 +123,8 @@ endif include ../Rules ifeq ($(run-built-tests),yes) -LOCALES := cs_CZ.UTF-8 de_DE.UTF-8 en_US.ISO-8859-1 tr_TR.UTF-8 +LOCALES := cs_CZ.UTF-8 de_DE.UTF-8 en_US.ISO-8859-1 tr_TR.UTF-8 \ + tr_TR.ISO-8859-9 include ../gen-locales.mk $(objpfx)bug-strtod2.out: $(gen-locales) @@ -131,6 +133,7 @@ $(objpfx)tst-strtod.out: $(gen-locales) $(objpfx)tst-strtod3.out: $(gen-locales) $(objpfx)tst-strtod4.out: $(gen-locales) $(objpfx)tst-strtod5.out: $(gen-locales) +$(objpfx)tst-strtol-locale.out: $(gen-locales) endif # Testdir has to be named stdlib and needs to be writable diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c index 8f6163d2f1..392b31a80d 100644 --- a/stdlib/strtol_l.c +++ b/stdlib/strtol_l.c @@ -137,8 +137,8 @@ # define UCHAR_TYPE wint_t # define STRING_TYPE wchar_t # define ISSPACE(Ch) __iswspace_l ((Ch), loc) -# define ISALPHA(Ch) __iswalpha_l ((Ch), loc) -# define TOUPPER(Ch) __towupper_l ((Ch), loc) +# define ISALPHA(Ch) __iswalpha_l ((Ch), _nl_C_locobj_ptr) +# define TOUPPER(Ch) __towupper_l ((Ch), _nl_C_locobj_ptr) #else # if defined _LIBC \ || defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII) @@ -150,8 +150,8 @@ # define UCHAR_TYPE unsigned char # define STRING_TYPE char # define ISSPACE(Ch) __isspace_l ((Ch), loc) -# define ISALPHA(Ch) __isalpha_l ((Ch), loc) -# define TOUPPER(Ch) __toupper_l ((Ch), loc) +# define ISALPHA(Ch) __isalpha_l ((Ch), _nl_C_locobj_ptr) +# define TOUPPER(Ch) __toupper_l ((Ch), _nl_C_locobj_ptr) #endif #define INTERNAL(X) INTERNAL1(X) diff --git a/stdlib/tst-strtol-locale-main.c b/stdlib/tst-strtol-locale-main.c new file mode 100644 index 0000000000..8293e07e15 --- /dev/null +++ b/stdlib/tst-strtol-locale-main.c @@ -0,0 +1,87 @@ +/* Test strtol functions work with all ASCII letters in Turkish + locales (bug 19242). + Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <locale.h> +#include <stdio.h> +#include <stdlib.h> +#include <wchar.h> + +#define STR_(X) #X +#define STR(X) STR_(X) +#define FNPFXS STR (FNPFX) +#define CONCAT_(X, Y) X ## Y +#define CONCAT(X, Y) CONCAT_ (X, Y) +#define FNX(FN) CONCAT (FNPFX, FN) + +#define TEST(LOC, STR, EXP_VAL, FN, TYPE, FMT) \ + do \ + { \ + CHAR *ep; \ + TYPE val = FNX (FN) (STR, &ep, 36); \ + printf ("%s: " FNPFXS #FN " (" SFMT ") == " FMT "\n", LOC, STR, val); \ + if (val == (TYPE) (EXP_VAL) && *ep == 0) \ + printf ("PASS: %s: " FNPFXS #FN " (" SFMT ")\n", LOC, STR); \ + else \ + { \ + printf ("FAIL: %s: " FNPFXS #FN " (" SFMT ")\n", LOC, STR); \ + result = 1; \ + } \ + } \ + while (0) + +static int +test_one_locale (const char *loc) +{ + if (setlocale (LC_ALL, loc) == NULL) + { + printf ("setlocale (LC_ALL, \"%s\") failed\n", loc); + return 1; + } + int result = 0; + for (int i = 10; i < 36; i++) + { + CHAR s[2]; + s[0] = L_('A') + i - 10; + s[1] = 0; + TEST (loc, s, i, l, long int, "%ld"); + TEST (loc, s, i, ul, unsigned long int, "%lu"); + TEST (loc, s, i, ll, long long int, "%lld"); + TEST (loc, s, i, ull, unsigned long long int, "%llu"); + s[0] = L_('a') + i - 10; + s[1] = 0; + TEST (loc, s, i, l, long int, "%ld"); + TEST (loc, s, i, ul, unsigned long int, "%lu"); + TEST (loc, s, i, ll, long long int, "%lld"); + TEST (loc, s, i, ull, unsigned long long int, "%llu"); + } + return result; +} + +static int +do_test (void) +{ + int result = 0; + result |= test_one_locale ("C"); + result |= test_one_locale ("tr_TR.UTF-8"); + result |= test_one_locale ("tr_TR.ISO-8859-9"); + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-strtol-locale.c b/stdlib/tst-strtol-locale.c new file mode 100644 index 0000000000..739d0b08c5 --- /dev/null +++ b/stdlib/tst-strtol-locale.c @@ -0,0 +1,25 @@ +/* Test strtol functions work with all ASCII letters in Turkish + locales (bug 19242). Narrow string version. + Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#define CHAR char +#define SFMT "\"%s\"" +#define FNPFX strto +#define L_(C) C + +#include <tst-strtol-locale-main.c> |