diff options
Diffstat (limited to 'wctype/wctype.c')
| -rw-r--r-- | wctype/wctype.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/wctype/wctype.c b/wctype/wctype.c index 6f6338c2e2..476707cfd2 100644 --- a/wctype/wctype.c +++ b/wctype/wctype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -26,11 +26,11 @@ wctype_t __wctype (const char *property) { const char *names; - wctype_t result; + unsigned int result; size_t proplen = strlen (property); names = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS_NAMES); - for (result = 1; result != 0; result <<= 1) + for (result = 0; ; result++) { size_t nameslen = strlen (names); @@ -42,13 +42,22 @@ __wctype (const char *property) return 0; } + if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_HASH_SIZE) != 0) + { + /* Old locale format. */ #if __BYTE_ORDER == __BIG_ENDIAN - return result; + return 1 << result; #else # define SWAPU32(w) \ (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24)) - - return SWAPU32 (result); + return 1 << (result ^ 0x18); /* = SWAPU32 (1 << result); */ #endif + } + else + { + /* New locale format. */ + size_t i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_CLASS_OFFSET) + result; + return (wctype_t) _nl_current_LC_CTYPE->values[i].string; + } } weak_alias (__wctype, wctype) |