mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08: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.
79 lines
2.2 KiB
C
79 lines
2.2 KiB
C
/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
|
|
|
|
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. */
|
|
|
|
#ifndef _CHARMAP_H
|
|
#define _CHARMAP_H
|
|
|
|
#include <obstack.h>
|
|
|
|
#include "repertoire.h"
|
|
#include "simple-hash.h"
|
|
|
|
|
|
struct width_rule
|
|
{
|
|
struct charseq *from;
|
|
struct charseq *to;
|
|
unsigned int width;
|
|
};
|
|
|
|
|
|
struct charmap_t
|
|
{
|
|
const char *code_set_name;
|
|
const char *repertoiremap;
|
|
int mb_cur_min;
|
|
int mb_cur_max;
|
|
|
|
struct width_rule *width_rules;
|
|
size_t nwidth_rules;
|
|
size_t nwidth_rules_max;
|
|
unsigned int width_default;
|
|
|
|
struct obstack mem_pool;
|
|
hash_table char_table;
|
|
hash_table byte_table;
|
|
hash_table ucs4_table;
|
|
};
|
|
|
|
|
|
/* This is the structure used for entries in the hash table. It represents
|
|
the sequence of bytes used for the coded character. */
|
|
struct charseq
|
|
{
|
|
const char *name;
|
|
uint32_t ucs4;
|
|
int nbytes;
|
|
unsigned char bytes[0];
|
|
};
|
|
|
|
|
|
/* Prototypes for charmap handling functions. */
|
|
extern struct charmap_t *charmap_read (const char *filename);
|
|
|
|
/* Return the value stored under the given key in the hashing table. */
|
|
extern struct charseq *charmap_find_value (const struct charmap_t *charmap,
|
|
const char *name, size_t len);
|
|
|
|
/* Return symbol for given multibyte sequence. */
|
|
extern struct charseq *charmap_find_symbol (const struct charmap_t *charmap,
|
|
const char *name, size_t len);
|
|
|
|
#endif /* charmap.h */
|