diff options
author | Roland McGrath <roland@gnu.org> | 1996-07-29 03:49:00 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-07-29 03:49:00 +0000 |
commit | ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52 (patch) | |
tree | efbd26a9837de025fc405475655d24d83761cfee /locale/lc-collate.c | |
parent | cddcfecfd1a8f91ee1da1c0147a4f07aee1846a0 (diff) | |
download | glibc-ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52.zip glibc-ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52.tar.gz glibc-ce7a5ef4bc04ee3ca9d2f42377ca6593d8492a52.tar.bz2 |
Sun Jul 28 23:46:14 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/strftime.c (strftime: do_number): Initialize PRINTED to
MAXDIGITS in case P is null and so sprintf is never actually called.
Mon Jul 29 02:46:23 1996 Ulrich Drepper <drepper@cygnus.com>
Add support for the to-be-written internationalized regexp.
This code must be able to use collation symbols and collation
equivalent classes.
* locale/C-collate.c (_nl_C_LC_COLLATE_symbol_hash,
_nl_C_LC_COLLATE_symbol_strings, _nl_C_LC_COLLATE_symbol_classes):
New global variables for collation classes.
* locale/categories.def: Add new descriptions for collation symbols
and collation classes.
* locale/langinfo.h: Add constants for collation symbols and
collation classes.
* locale/lc-collate.c: Add new global variables for collation symbols
and collation classes.
(_nl_postload_collate): Initialize new variables.
* locale/programs/ld-collate.c: Add code to emit tables for
collation symbols and collation classes.
* locale/programs/locales.h: Change prototype for `collate_output'.
* locale/programs/locfile.c (write_all_categories): Call
`collate_output' with new argument.
* locale/localeinfo.h: Add declaration for new global vars.
(union locale_data_value): New member wstr for `wchar_t' strings.
* locale/programs/locale-spec.c: Handle `collate-classes'
keyword and print information about available collation classes.
* locale/strlen-hash.h: New file. Simple hashing function which
takes a string with known length.
* locale/Makefile (distribute): Add strlen-hash.h.
(locale-modules): New var. Additional files for `locale' program.
* locale/C-ctype.c: Rewrite to avoid using string for giving values
which are of type `u_int32_t'.
Correct entry for EOF in toupper and tolower tables.
* locale/loadlocale.c (_nl_load_locale): Add cast to prevent
warning.
* locale/programs/ld-ctype.c (ctype_output): Add code to make
sure that all tables in binary file are words aligned.
* locale/programs/locfile.c (write_locale_data): Correct handling
of LC_MESSAGES locale. Create directory if necessary.
* locale/setlocale.c (setlocale): Add cast to avoid warning.
* string/string.h: Add prototype for `__strndup'.
Wed Jul 24 19:10:00 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* wcsmbs/mbrtowc.c: Remove unused variable.
Sun Jul 28 22:40:25 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/sysv/linux/configure.in (LIBC_LINUX_VERSION): Update to
2.0.10; some problems were reported with an earlier version, and this
one is known to work.
* sysdeps/generic/dl-sysdep.c (__libc_enable_secure): New variable.
* sysdeps/mach/hurd/dl-sysdep.c: Likewise.
Diffstat (limited to 'locale/lc-collate.c')
-rw-r--r-- | locale/lc-collate.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/locale/lc-collate.c b/locale/lc-collate.c index 23643b2..aefdaa8 100644 --- a/locale/lc-collate.c +++ b/locale/lc-collate.c @@ -20,12 +20,28 @@ Boston, MA 02111-1307, USA. */ #include "localeinfo.h" #include <endian.h> + +extern const u_int32_t _nl_C_LC_COLLATE_symbol_hash[]; +extern const char _nl_C_LC_COLLATE_symbol_strings[]; +extern const u_int32_t _nl_C_LC_COLLATE_symbol_classes[]; + + _NL_CURRENT_DEFINE (LC_COLLATE); -const u_int32_t *__collate_table; -const u_int32_t *__collate_extra; +const u_int32_t *__collate_table = NULL; +const u_int32_t *__collate_extra = NULL; + +const u_int32_t *__collate_element_hash = NULL; +const char *__collate_element_strings = NULL; +const wchar_t *__collate_element_values = NULL; +const u_int32_t *__collate_symbol_hash = _nl_C_LC_COLLATE_symbol_hash; +const char *__collate_symbol_strings = _nl_C_LC_COLLATE_symbol_strings; +const u_int32_t *__collate_symbol_classes = _nl_C_LC_COLLATE_symbol_classes; + +/* We are called after loading LC_CTYPE data to load it into + the variables used by the collation functions and regex. */ void _nl_postload_collate (void) { @@ -44,4 +60,12 @@ _nl_postload_collate (void) __collate_table = current (bo (TABLE)); __collate_extra = current (bo (EXTRA)); + + __collate_element_hash = current (bo (ELEM_HASH)); + __collate_element_strings = (const char *) current (ELEM_STR_POOL); + __collate_element_values = (const wchar_t *) current (bo (ELEM_VAL)); + + __collate_symbol_hash = current (bo (SYMB_HASH)); + __collate_symbol_strings = (const char *) current (SYMB_STR_POOL); + __collate_symbol_classes = current (bo (SYMB_CLASS)); } |