mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 02:40:08 +00:00
4b10dd6c19
* locale/Makefile (distribute): Add iso-639.def and iso-3166.def. Change charset.h to charmap.h. (categories): Add new categories. Leave out collate for now. Update build rules. * locale/categories.def: Add definitions for new categories. * locale/langinfo.h: Likewise. * locale/locale.h: Likewise. * locale/C-address.c: New file. * locale/C-identification.c: New file. * locale/C-measurement.c: New file. * locale/C-name.c: New file. * locale/C-paper.c: New file. * locale/C-telephone.c: New file. * locale/lc-address.c: Likewise. * locale/lc-identification.c: Likewise. * locale/lc-measurement.c: Likewise. * locale/lc-name.c: Likewise. * locale/lc-paper.c: Likewise. * locale/lc-telephone.c: Likewise. * locale/C-ctype.c: Update for locale rewrite. * locale/C-messages.c: Likewise. * locale/C-monetary.c: Likewise. * locale/C-time.c: Likewise. * locale/lc-collate.c: Likewise. * locale/lc-ctype.c: Likewise. * locale/lc-monetary.c: Likewise. * locale/lc-time.c: Likewise. * locale/localeinfo.h: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * locale/weight.h: Likewise. * locale/findlocale.c: Unconditionally use mmap. Handle new categories. * locale/loadlocale.c: Likewise. * locale/iso-3166.def: New file. * locale/iso-639.def: New file. * locale/programs/charmap-kw.gperf: Add new keywords. * locale/programs/locfile-kw.gperf: Likewise. * locale/programs/locfile-token.h: Define new tokens. * locale/programs/charmap.c: Rewrite to handle multibyte charsets. * locale/programs/charmap.h: New file. * locale/programs/charset.h: Removed. * locale/programs/config.h: Add __LC_LAST. * locale/programs/lc-address.c: New file. * locale/programs/lc-identification.c: New file. * locale/programs/lc-measurement.c: New file. * locale/programs/lc-name.c: New file. * locale/programs/lc-paper.c: New file. * locale/programs/lc-telephone.c: New file. * locale/programs/lc-collate.c: Update for locale rewrite. * locale/programs/lc-ctype.c: Likewise. * locale/programs/lc-messages.c: Likewise. * locale/programs/lc-monetary.c: Likewise. * locale/programs/lc-numeric.c: Likewise. * locale/programs/lc-time.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locfile.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/repertoire.h: Likewise. * locale/programs/locfile.c: Update prototypes. Update handle_copy definition. * locale/programs/linereader.c: Add handling of wide char strings and new definition file syntax. * locale/programs/linereader.h (struct token): Add elements for wide character strings. * locale/programs/locale-spec.c: Disable handling of collation elements for now. * locale/programs/simple-hash.h: Cleanup. * locale/programs/stringtrans.h: Handle quite of end of line. * string/strcoll.c: Fall back on strcmp for now. * string/strxfrm.c: Fall back on strncpy/strlen for now. * time/strftime.c: Use new wide character data for wcsftime. * time/strptime.c: Remove _nl_C_LC_TIME declaration. * wctype/cname-lookup.h: Update for new LC_CTYPE data.
72 lines
2.5 KiB
C
72 lines
2.5 KiB
C
/* Define current locale data for LC_COLLATE category.
|
|
Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
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_tablewc;
|
|
const u_int32_t *__collate_extrawc;
|
|
|
|
const u_int32_t *__collate_element_hash;
|
|
const char *__collate_element_strings;
|
|
const uint32_t *__collate_element_values;
|
|
|
|
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_classeswc = _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)
|
|
{
|
|
#if BYTE_ORDER == BIG_ENDIAN
|
|
#define bo(x) x##_EB
|
|
#elif BYTE_ORDER == LITTLE_ENDIAN
|
|
#define bo(x) x##_EL
|
|
#else
|
|
#error bizarre byte order
|
|
#endif
|
|
#define paste(a,b) paste1(a,b)
|
|
#define paste1(a,b) a##b
|
|
|
|
#define current(x) \
|
|
((const unsigned int *) _NL_CURRENT (LC_COLLATE, paste(_NL_COLLATE_,x)))
|
|
|
|
__collate_tablewc = current (bo (TABLEWC));
|
|
__collate_extrawc = current (bo (EXTRAWC));
|
|
|
|
__collate_element_hash = current (bo (ELEM_HASH));
|
|
__collate_element_strings = (const char *) current (ELEM_STR_POOL);
|
|
__collate_element_values = (const uint32_t *) current (bo (ELEM_VAL));
|
|
|
|
__collate_symbol_hash = current (bo (SYMB_HASH));
|
|
__collate_symbol_strings = (const char *) current (SYMB_STR_POOL);
|
|
__collate_symbol_classeswc = current (bo (SYMB_CLASSWC));
|
|
}
|