+2000-07-27 Bruno Haible <haible@clisp.cons.org>
+
+ * locale/C-ctype.c (_nl_C_LC_CTYPE): Swap the two names in
+ _NL_CTYPE_MAP_NAMES.
+ * locale/localeinfo.h (__TOW_toupper, __TOW_tolower): New enum values.
+ * wctype/wcfuncs.c (towlower, towupper): Use them.
+ * wctype/wcfuncs_l.c (__towlower_l, __towupper_l): Likewise.
+ * wctype/wctrans.c (wctrans): Likewise.
+ * wctype/wctrans_l.c (__wctrans_l): Likewise.
+
+2000-07-27 Bruno Haible <haible@clisp.cons.org>
+
+ * posix/fnmatch.c (is_char_class): Fix logic. Avoid buffer overrun.
+ Use the optimized version of this function outside glibc as well.
+
2000-07-27 Jakub Jelinek <jakub@redhat.com>
* locale/indigits.h (indigit_value): Correct.
"vowel_connect\0"
#endif
},
- { string: "tolower\0" "toupper\0"
+ { string: "toupper\0" "tolower\0"
#ifdef PREDEFINED_CLASSES
"tosymmetric\0"
#endif
};
+/* LC_CTYPE specific:
+ Hardwired indices for standard wide character translation mappings. */
+enum
+{
+ __TOW_toupper = 0,
+ __TOW_tolower = 1
+};
+
+
/* For each category declare the variable for the current locale data. */
#define DEFINE_CATEGORY(category, category_name, items, a) \
extern struct locale_data *_nl_current_##category;
+2000-07-27 Bruno Haible <haible@clisp.cons.org>
+
+ * tests-mbwc/tgn_locdef.h (TST_LOC_C): New macro.
+ * tests-mbwc/dat_towctrans.c: Apply the en_US test also to the C
+ locale.
+
2000-07-28 Ulrich Drepper <drepper@redhat.com>
* locales/zh_TW: New file.
TST_TOWCTRANS tst_towctrans_loc [] = {
{
+ { Ttowctrans, TST_LOC_C },
+ {
+#ifdef SHOJI_IS_RIGHT
+ { { 0x0010, "xxxxxxx" }, { 1,EINVAL,1,0x0010 } },
+#else
+ { { 0x0010, "xxxxxxx" }, { 1,0, 1,0x0010 } },
+#endif
+ { { 0x007F, "tolower" }, { 1,0, 1,0x007F } },
+ { { 0x0061, "toupper" }, { 1,0, 1,0x0041 } },
+ { { 0x0041, "tolower" }, { 1,0, 1,0x0061 } },
+ { is_last: 1 }
+ }
+ },
+ {
{ Ttowctrans, TST_LOC_de },
{
#ifdef SHOJI_IS_RIGHT
/* Defines for all locales used in the suite. */
+/* POSIX C locale. */
+#define TST_LOC_C "C"
+
/* German locale with ISO-8859-1. */
#define TST_LOC_de "de_DE.ISO-8859-1"
# define SUFFIX WC
# define WIDE_CHAR_VERSION 1
-
# undef IS_CHAR_CLASS
-# ifdef _LIBC
/* We have to convert the wide character string in a multibyte string. But
- we know that the character class names are ASCII strings and since the
- internal wide character encoding is UCS4 we can use a simplified method
- to convert the string to a multibyte character string. */
+ we know that the character class names consist of alphanumeric characters
+ from the portable character set, and since the wide character encoding
+ for a member of the portable character set is the same code point as
+ its single-byte encoding, we can use a simplified method to convert the
+ string to a multibyte character string. */
static wctype_t
is_char_class (const wchar_t *wcs)
{
do
{
- if (*wcs < 0x20 || *wcs >= 0x7f)
- return 0;
-
- *cp++ = (char) *wcs;
- }
- while (*wcs++ != L'\0');
-
- return __wctype (s);
-}
+ /* Test for a printable character from the portable character set. */
+# ifdef _LIBC
+ if (*wcs < 0x20 || *wcs > 0x7e
+ || *wcs == 0x24 || *wcs == 0x40 || *wcs == 0x60)
+ return (wctype_t) 0;
# else
-/* Since we cannot assume anything about the internal encoding we have to
- convert the string back to multibyte representation the hard way. */
-static wctype_t
-is_char_class (const wchar_t *wcs)
-{
- mbstate_t ps;
- const wchar_t *pwc;
- char *s;
- size_t n;
+ switch (*wcs)
+ {
+ case L' ': case L'!': case L'"': case L'#': case L'%':
+ case L'&': case L'\'': case L'(': case L')': case L'*':
+ case L'+': case L',': case L'-': case L'.': case L'/':
+ case L'0': case L'1': case L'2': case L'3': case L'4':
+ case L'5': case L'6': case L'7': case L'8': case L'9':
+ case L':': case L';': case L'<': case L'=': case L'>':
+ case L'?':
+ case L'A': case L'B': case L'C': case L'D': case L'E':
+ case L'F': case L'G': case L'H': case L'I': case L'J':
+ case L'K': case L'L': case L'M': case L'N': case L'O':
+ case L'P': case L'Q': case L'R': case L'S': case L'T':
+ case L'U': case L'V': case L'W': case L'X': case L'Y':
+ case L'Z':
+ case L'[': case L'\\': case L']': case L'^': case L'_':
+ case L'a': case L'b': case L'c': case L'd': case L'e':
+ case L'f': case L'g': case L'h': case L'i': case L'j':
+ case L'k': case L'l': case L'm': case L'n': case L'o':
+ case L'p': case L'q': case L'r': case L's': case L't':
+ case L'u': case L'v': case L'w': case L'x': case L'y':
+ case L'z': case L'{': case L'|': case L'}': case L'~':
+ break;
+ default:
+ return (wctype_t) 0;
+ }
+# endif
- memset (&ps, '\0', sizeof (ps));
+ /* Avoid overrunning the buffer. */
+ if (cp == s + CHAR_CLASS_MAX_LENGTH)
+ return (wctype_t) 0;
- pwc = wcs;
- n = wcsrtombs (NULL, &pwc, 0, &ps);
- if (n == (size_t) -1)
- /* Something went wrong. */
- return 0;
+ *cp++ = (char) *wcs++;
+ }
+ while (*wcs != L'\0');
- s = alloca (n + 1);
- assert (mbsinit (&ps));
- pwc = wcs;
- (void) wcsrtombs (s, &pwc, n + 1, &ps);
+ *cp = '\0';
+# ifdef _LIBC
+ return __wctype (s);
+# else
return wctype (s);
-}
# endif
+}
# define IS_CHAR_CLASS(string) is_char_class (string)
# include "fnmatch_loop.c"
# endif
+
int
fnmatch (pattern, string, flags)
const char *pattern;
else
{
/* New locale format. */
- return wctrans_table_lookup (__ctype32_wctrans[1], wc);
+ return wctrans_table_lookup (__ctype32_wctrans[__TOW_tolower], wc);
}
}
else
{
/* New locale format. */
- return wctrans_table_lookup (__ctype32_wctrans[0], wc);
+ return wctrans_table_lookup (__ctype32_wctrans[__TOW_toupper], wc);
}
}
else
{
/* New locale format. */
- size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + 1;
+ size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_tolower;
const char *desc = locale->__locales[LC_CTYPE]->values[i].string;
return wctrans_table_lookup (desc, wc);
}
else
{
/* New locale format. */
- size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + 0;
+ size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_toupper;
const char *desc = locale->__locales[LC_CTYPE]->values[i].string;
return wctrans_table_lookup (desc, wc);
}
if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_SIZE) != 0)
{
/* Old locale format. */
- if (cnt == 0)
+ if (cnt == __TOW_toupper)
return (wctrans_t) __ctype32_toupper;
- else if (cnt == 1)
+ else if (cnt == __TOW_tolower)
return (wctrans_t) __ctype32_tolower;
/* We have to search the table. */
if (locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE)].word == 0)
{
/* Old locale format. */
- if (cnt == 0)
+ if (cnt == __TOW_toupper)
return (wctrans_t) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER32)].string;
- else if (cnt == 1)
+ else if (cnt == __TOW_tolower)
return (wctrans_t) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER32)].string;
/* We have to search the table. */
projects / platform / upstream / linaro-glibc.git / commitdiff