diff options
author | Carlos O'Donell <carlos@redhat.com> | 2021-09-01 15:19:19 -0400 |
---|---|---|
committer | Carlos O'Donell <carlos@redhat.com> | 2021-09-06 11:30:28 -0400 |
commit | 466f2be6c08070e9113ae2fdc7acd5d8828cba50 (patch) | |
tree | c4fb7c10d98994298dcd451df71f1be790b575e9 /posix/bug-regex19.c | |
parent | f5117c6504888fab5423282a4607c552b90fd3f9 (diff) | |
download | glibc-466f2be6c08070e9113ae2fdc7acd5d8828cba50.tar glibc-466f2be6c08070e9113ae2fdc7acd5d8828cba50.tar.gz glibc-466f2be6c08070e9113ae2fdc7acd5d8828cba50.tar.bz2 glibc-466f2be6c08070e9113ae2fdc7acd5d8828cba50.zip |
Add generic C.UTF-8 locale (Bug 17318)
We add a new C.UTF-8 locale. This locale is not builtin to glibc, but
is provided as a distinct locale. The locale provides full support for
UTF-8 and this includes full code point sorting via STRCMP-based
collation (strcmp or wcscmp).
The collation uses a new keyword 'codepoint_collation' which drops all
collation rules and generates an empty zero rules collation to enable
STRCMP usage in collation. This ensures that we get full code point
sorting for C.UTF-8 with a minimal 1406 bytes of overhead (LC_COLLATE
structure information and ASCII collating tables).
The new locale is added to SUPPORTED. Minimal test data for specific
code points (minus those not supported by collate-test) is provided in
C.UTF-8.in, and this verifies code point sorting is working reasonably
across the range. The locale was tested manually with the full set of
code points without failure.
The locale is harmonized with locales already shipping in various
downstream distributions. A new tst-iconv9 test is added which verifies
the C.UTF-8 locale is generally usable.
Testing for fnmatch, regexec, and recomp is provided by extending
bug-regex1, bugregex19, bug-regex4, bug-regex6, transbug, tst-fnmatch,
tst-regcomp-truncated, and tst-regex to use C.UTF-8.
Tested on x86_64 or i686 without regression.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'posix/bug-regex19.c')
-rw-r--r-- | posix/bug-regex19.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/posix/bug-regex19.c b/posix/bug-regex19.c index 001827c3a8..44f6ab606f 100644 --- a/posix/bug-regex19.c +++ b/posix/bug-regex19.c @@ -24,6 +24,7 @@ #include <string.h> #include <locale.h> #include <libc-diag.h> +#include <support/support.h> #define BRE RE_SYNTAX_POSIX_BASIC #define ERE RE_SYNTAX_POSIX_EXTENDED @@ -406,8 +407,8 @@ do_mb_tests (const struct test_s *test) return 0; } -int -main (void) +static int +do_test (void) { size_t i; int ret = 0; @@ -416,20 +417,17 @@ main (void) for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i) { - if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL) - { - puts ("setlocale de_DE.ISO-8859-1 failed"); - ret = 1; - } + xsetlocale (LC_ALL, "de_DE.ISO-8859-1"); ret |= do_one_test (&tests[i], ""); - if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL) - { - puts ("setlocale de_DE.UTF-8 failed"); - ret = 1; - } + xsetlocale (LC_ALL, "de_DE.UTF-8"); + ret |= do_one_test (&tests[i], "UTF-8 "); + ret |= do_mb_tests (&tests[i]); + xsetlocale (LC_ALL, "C.UTF-8"); ret |= do_one_test (&tests[i], "UTF-8 "); ret |= do_mb_tests (&tests[i]); } return ret; } + +#include <support/test-driver.c> |