diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | localedata/ChangeLog | 7 | ||||
| -rw-r--r-- | localedata/locales/i18n | 6 | ||||
| -rw-r--r-- | posix/Makefile | 2 | ||||
| -rw-r--r-- | posix/bug-regex3.c | 44 | ||||
| -rw-r--r-- | posix/regex.c | 15 |
6 files changed, 75 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index cf9187cb02..d2614717b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-02-15 Jakub Jelinek <jakub@redhat.com> + + * posix/regex.c (init_syntax_once): Add prototype. + (TRANSLATE): If MBS_SUPPORT, translate all characters up to '\xff'. + (re_search_2): Avoid warning. + (count_mbs_length): Add prototype. + * posix/tst-regex3.c: New file. + * posix/Makefile (tests): Add bug-regex3. + 2001-02-15 Ulrich Drepper <drepper@redhat.com> * stdio-common/Makefile (tests): Add tst-gets. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index bd2debb725..d8a6996324 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,10 @@ +2001-02-15 Ulrich Drepper <drepper@redhat.com> + + * locales/i18n: Correct classification of Thai characters. This + differs from Unicode's tables but is in line with linguistic rules + in Thailand. + Patch by Theppitak Karoonboonyanan <thep@links.nectec.or.th>. + 2001-02-14 Ulrich Drepper <drepper@redhat.com> * charmaps/GB18030: Update for Dec 2000 re-release of GB18030. diff --git a/localedata/locales/i18n b/localedata/locales/i18n index 96aec61e16..7c5319dd71 100644 --- a/localedata/locales/i18n +++ b/localedata/locales/i18n @@ -222,7 +222,7 @@ alpha / <U0D85>..<U0D96>;<U0D9A>..<U0DB1>;<U0DB3>..<U0DBB>;<U0DBD>;/ <U0DC0>..<U0DC6>;/ % TABLE 26 THAI/ - <U0E01>..<U0E30>;<U0E32>;<U0E33>;<U0E40>..<U0E46>;/ + <U0E01>..<U0E2E>;<U0E30>..<U0E3A>;<U0E40>..<U0E45>;<U0E47>..<U0E4E>;/ % TABLE 27 LAO/ <U0E81>..<U0E82>;<U0E84>;<U0E87>..<U0E88>;<U0E8A>;<U0E8D>;/ <U0E94>..<U0E97>;<U0E99>..<U0E9F>;<U0EA1>..<U0EA3>;<U0EA5>;<U0EA7>;/ @@ -394,8 +394,8 @@ punct / <U0C82>..<U0C83>;<U0CBE>..<U0CC4>;<U0CC6>..<U0CC8>;<U0CCA>..<U0CCD>;/ <U0CD5>..<U0CD6>;<U0D02>..<U0D03>;<U0D3E>..<U0D43>;<U0D46>..<U0D48>;/ <U0D4A>..<U0D4D>;<U0D57>;<U0D82>..<U0D83>;<U0DCA>;<U0DCF>..<U0DD4>;/ - <U0DD6>;<U0DD8>..<U0DDF>;<U0DF2>..<U0DF4>;<U0E31>;<U0E34>..<U0E3A>;/ - <U0E3F>;<U0E47>..<U0E4F>;<U0E5A>..<U0E5B>;<U0EB1>;<U0EB4>..<U0EB9>;/ + <U0DD6>;<U0DD8>..<U0DDF>;<U0DF2>..<U0DF4>;<U0E2F>;<U0E3F>;<U0E46>;/ + <U0E4F>;<U0E5A>..<U0E5B>;<U0EB1>;<U0EB4>..<U0EB9>;/ <U0EBB>..<U0EBC>;<U0EC8>..<U0ECD>;<U0F01>..<U0F1F>;<U0F2A>..<U0F3F>;/ <U0F71>..<U0F87>;<U0F90>..<U0F97>;<U0F99>..<U0FBC>;<U0FBE>..<U0FCC>;/ <U0FCF>;<U102C>..<U1032>;<U1036>..<U1039>;<U104A>..<U104F>;/ diff --git a/posix/Makefile b/posix/Makefile index c20fa389a2..e61bf6565a 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -69,7 +69,7 @@ tests := tstgetopt testfnm runtests runptests \ tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \ tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \ tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \ - tst-chmod bug-regex1 bug-regex2 tst-gnuglob + tst-chmod bug-regex1 bug-regex2 bug-regex3 tst-gnuglob ifeq (yes,$(build-shared)) test-srcs := globtest tests += wordexp-test tst-exec tst-spawn diff --git a/posix/bug-regex3.c b/posix/bug-regex3.c new file mode 100644 index 0000000000..90da85a8be --- /dev/null +++ b/posix/bug-regex3.c @@ -0,0 +1,44 @@ +/* Test for case handling in regex. + Copyright (C) 2001 Free Software Foundation, Inc. + Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/types.h> +#include <regex.h> +#include <stdio.h> +#include <stdlib.h> + + +int +main (void) +{ + regex_t re; + int n; + + n = regcomp (&re, "[a-bA-B]", REG_ICASE); + if (n != 0) + { + char buf[500]; + regerror (n, &re, buf, sizeof (buf)); + printf ("regcomp failed: %s\n", buf); + exit (1); + } + + regfree (&re); + + return 0; +} diff --git a/posix/regex.c b/posix/regex.c index 2b1a62b799..fc25bb0c14 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -290,6 +290,8 @@ extern char *re_syntax_table; static char re_syntax_table[CHAR_SET_SIZE]; +static void init_syntax_once PARAMS ((void)); + static void init_syntax_once () { @@ -1906,7 +1908,8 @@ static reg_errcode_t compile_range _RE_ARGS ((unsigned int range_start, #ifndef TRANSLATE # ifdef MBS_SUPPORT # define TRANSLATE(d) \ - (translate && (sizeof(d) <= 1)? (char) translate[(unsigned char) (d)] : (d)) + ((translate && ((US_CHAR_TYPE) (d)) <= 0xff) \ + ? (char) translate[(unsigned char) (d)] : (d)) #else # define TRANSLATE(d) \ (translate ? (char) translate[(unsigned char) (d)] : (d)) @@ -5058,9 +5061,9 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) } else /* Searching backwards. */ { - register char c = (size1 == 0 || startpos >= size1 - ? string2[startpos - size1] - : string1[startpos]); + register CHAR_TYPE c = (size1 == 0 || startpos >= size1 + ? string2[startpos - size1] + : string1[startpos]); if (!fastmap[(unsigned char) TRANSLATE (c)]) goto advance; @@ -5309,10 +5312,14 @@ weak_alias (__re_match_2, re_match_2) #endif #ifdef MBS_SUPPORT + +static int count_mbs_length PARAMS ((int *, int)); + /* This check the substring (from 0, to length) of the multibyte string, to which offset_buffer correspond. And count how many wchar_t_characters the substring occupy. We use offset_buffer to optimization. See convert_mbs_to_wcs. */ + static int count_mbs_length(offset_buffer, length) int *offset_buffer; |