about summary refs log tree commit diff
path: root/posix/bug-regex1.c
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2021-09-01 15:19:19 -0400
committerCarlos O'Donell <carlos@redhat.com>2021-09-06 11:30:28 -0400
commit466f2be6c08070e9113ae2fdc7acd5d8828cba50 (patch)
treec4fb7c10d98994298dcd451df71f1be790b575e9 /posix/bug-regex1.c
parentf5117c6504888fab5423282a4607c552b90fd3f9 (diff)
downloadglibc-466f2be6c08070e9113ae2fdc7acd5d8828cba50.tar.gz
glibc-466f2be6c08070e9113ae2fdc7acd5d8828cba50.tar.xz
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-regex1.c')
-rw-r--r--posix/bug-regex1.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/posix/bug-regex1.c b/posix/bug-regex1.c
index b8cf97c8ce..99357e359e 100644
--- a/posix/bug-regex1.c
+++ b/posix/bug-regex1.c
@@ -40,6 +40,26 @@ main (void)
 	puts (" -> OK");
     }
 
+  puts ("in C.UTF-8 locale");
+  setlocale (LC_ALL, "C.UTF-8");
+  s = re_compile_pattern ("[an\371]*n", 7, &regex);
+  if (s != NULL)
+    {
+      puts ("re_compile_pattern return non-NULL value");
+      result = 1;
+    }
+  else
+    {
+      match = re_match (&regex, "an", 2, 0, &regs);
+      if (match != 2)
+	{
+	  printf ("re_match returned %d, expected 2\n", match);
+	  result = 1;
+	}
+      else
+	puts (" -> OK");
+    }
+
   puts ("in de_DE.ISO-8859-1 locale");
   setlocale (LC_ALL, "de_DE.ISO-8859-1");
   s = re_compile_pattern ("[an\371]*n", 7, &regex);