diff options
| author | Tatsuo Ishii | 1999-03-25 04:46:53 +0000 |
|---|---|---|
| committer | Tatsuo Ishii | 1999-03-25 04:46:53 +0000 |
| commit | 235a569aaa422711238bc060381f2c9977537126 (patch) | |
| tree | 1ceb67c6ee881af236405a797f98197c4e3154c2 /src/backend/regex/regcomp.c | |
| parent | 6febecc569f42817b7b86a167a38e682317a6c2c (diff) | |
Fix multi-byte+locale problem
Diffstat (limited to 'src/backend/regex/regcomp.c')
| -rw-r--r-- | src/backend/regex/regcomp.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 99b1ade582e..b68f70c4dd6 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -95,7 +95,11 @@ extern "C" static void p_b_eclass(struct parse * p, cset *cs); static pg_wchar p_b_symbol(struct parse * p); static char p_b_coll_elem(struct parse * p, int endc); +#ifdef MULTIBYTE + static unsigned char othercase(int ch); +#else static char othercase(int ch); +#endif static void bothcases(struct parse * p, int ch); static void ordinary(struct parse * p, int ch); static void nonnewline(struct parse * p); @@ -1032,18 +1036,34 @@ int endc; /* name ended by endc,']' */ - othercase - return the case counterpart of an alphabetic == static char othercase(int ch); */ -static char /* if no counterpart, return ch */ +#ifdef MULTIBYTE +static unsigned char /* if no counterpart, return ch */ +#else +static char /* if no counterpart, return ch */ +#endif othercase(ch) int ch; { assert(pg_isalpha(ch)); if (pg_isupper(ch)) +#ifdef MULTIBYTE + return (unsigned char)tolower(ch); +#else return tolower(ch); +#endif else if (pg_islower(ch)) +#ifdef MULTIBYTE + return (unsigned char)toupper(ch); +#else return toupper(ch); +#endif else /* peculiar, but could happen */ +#ifdef MULTIBYTE + return (unsigned char)ch; +#else return ch; +#endif } /* |