mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-29 22:11:18 +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.
146 lines
3.2 KiB
C
146 lines
3.2 KiB
C
/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 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. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "charset.h"
|
|
#include "stringtrans.h"
|
|
|
|
|
|
/* Global variable. */
|
|
enum encoding_method encoding_method = ENC_UCS4;
|
|
|
|
|
|
void *xmalloc (size_t __n);
|
|
void *xrealloc (void *__p, size_t __n);
|
|
|
|
|
|
#define ADDC(ch) \
|
|
do \
|
|
{ \
|
|
char *cp; \
|
|
if (bufact + (encoding_method == ENC_UCS4 ? 4 : 1) >= bufmax) \
|
|
{ \
|
|
bufmax *= 2; \
|
|
buf = xrealloc (buf, bufmax); \
|
|
} \
|
|
cp = &buf[bufact]; \
|
|
if (encode_char (ch, &cp) < 0) \
|
|
{ \
|
|
free (buf); \
|
|
return NULL; \
|
|
} \
|
|
bufact = cp - buf; \
|
|
} \
|
|
while (0)
|
|
|
|
|
|
char *
|
|
translate_string (char *str, struct charset_t *charset)
|
|
{
|
|
char *buf;
|
|
size_t bufact = 0;
|
|
size_t bufmax = 56;
|
|
|
|
buf = (char *) xmalloc (bufmax);
|
|
|
|
while (str[0] != '\0')
|
|
{
|
|
char *tp;
|
|
unsigned int value;
|
|
|
|
if (str[0] != '<')
|
|
{
|
|
ADDC (*str++);
|
|
continue;
|
|
}
|
|
|
|
tp = &str[1];
|
|
while (tp[0] != '\0' && tp[0] != '>')
|
|
if (tp[0] == '\\')
|
|
if (tp[1] != '\0')
|
|
tp += 2;
|
|
else
|
|
++tp;
|
|
else
|
|
++tp;
|
|
|
|
if (tp[0] == '\0')
|
|
{
|
|
free (buf);
|
|
return NULL;
|
|
}
|
|
|
|
value = charset_find_value (&charset->char_table, str + 1,
|
|
tp - (str + 1));
|
|
if ((wchar_t) value == ILLEGAL_CHAR_VALUE)
|
|
{
|
|
free (buf);
|
|
return NULL;
|
|
}
|
|
else
|
|
/* Encode string using current method. */
|
|
ADDC (value);
|
|
|
|
str = &tp[1];
|
|
}
|
|
|
|
ADDC ('\0');
|
|
|
|
return buf;
|
|
}
|
|
|
|
|
|
int
|
|
encode_char (unsigned int value, char **cpp)
|
|
{
|
|
switch (encoding_method)
|
|
{
|
|
case ENC_UCS1:
|
|
if (value > 255)
|
|
return -1;
|
|
*(*cpp)++ = (char) value;
|
|
break;
|
|
|
|
case ENC_UCS4:
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
|
*(*cpp)++ = (char) (value >> 24);
|
|
*(*cpp)++ = (char) ((value >> 16) & 0xff);
|
|
*(*cpp)++ = (char) ((value >> 8) & 0xff);
|
|
*(*cpp)++ = (char) (value & 0xff);
|
|
#else
|
|
*(*cpp)++ = (char) (value & 0xff);
|
|
*(*cpp)++ = (char) ((value >>= 8) & 0xff);
|
|
*(*cpp)++ = (char) ((value >>= 8) & 0xff);
|
|
*(*cpp)++ = (char) ((value >>= 8) & 0xff);
|
|
#endif
|
|
break;
|
|
|
|
default:
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|