lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
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.
This commit is contained in:
Ulrich Drepper
2001-02-15 22:27:29 +00:00
parent 093b0a7df1
commit 2d0aea11b0
6 changed files with 75 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
posix/regex.c
View File

@ -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;