ce7a5ef4bc
* 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.
131 lines
3 KiB
C
131 lines
3 KiB
C
/* Copyright (C) 1996 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. */
|
|
|
|
#include <errno.h>
|
|
#include <wchar.h>
|
|
|
|
#ifndef EILSEQ
|
|
#define EILSEQ EINVAL
|
|
#endif
|
|
|
|
|
|
static mbstate_t internal;
|
|
|
|
size_t
|
|
mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
|
|
{
|
|
size_t used = 0;
|
|
|
|
if (ps == NULL)
|
|
ps = &internal;
|
|
|
|
if (s == NULL)
|
|
{
|
|
/* See first paragraph of description in 7.16.6.3.2. */
|
|
pwc = NULL;
|
|
s = "";
|
|
n = 1;
|
|
}
|
|
|
|
if (n > 0)
|
|
{
|
|
if (ps->count == 0)
|
|
{
|
|
unsigned char byte = (unsigned char) *s++;
|
|
++used;
|
|
|
|
/* We must look for a possible first byte of a UTF8 sequence. */
|
|
if (byte < 0x80)
|
|
{
|
|
/* One byte sequence. */
|
|
if (pwc != NULL)
|
|
*pwc = (wchar_t) byte;
|
|
return byte ? used : 0;
|
|
}
|
|
|
|
if ((byte & 0xc0) == 0x80 || (byte & 0xfe) == 0xfe)
|
|
{
|
|
/* Oh, oh. An encoding error. */
|
|
errno = EILSEQ;
|
|
return (size_t) -1;
|
|
}
|
|
|
|
if ((byte & 0xe0) == 0xc0)
|
|
{
|
|
/* We expect two bytes. */
|
|
ps->count = 1;
|
|
ps->value = byte & 0x1f;
|
|
}
|
|
else if ((byte & 0xf0) == 0xe0)
|
|
{
|
|
/* We expect three bytes. */
|
|
ps->count = 2;
|
|
ps->value = byte & 0x0f;
|
|
}
|
|
else if ((byte & 0xf8) == 0xf0)
|
|
{
|
|
/* We expect four bytes. */
|
|
ps->count = 3;
|
|
ps->value = byte & 0x07;
|
|
}
|
|
else if ((byte & 0xfc) == 0xf8)
|
|
{
|
|
/* We expect five bytes. */
|
|
ps->count = 4;
|
|
ps->value = byte & 0x03;
|
|
}
|
|
else
|
|
{
|
|
/* We expect six bytes. */
|
|
ps->count = 5;
|
|
ps->value = byte & 0x01;
|
|
}
|
|
}
|
|
|
|
/* We know we have to handle a multibyte character and there are
|
|
some more bytes to read. */
|
|
while (used < n)
|
|
{
|
|
/* The second to sixths byte must be of the form 10xxxxxx. */
|
|
unsigned char byte = (unsigned char) *s++;
|
|
++used;
|
|
|
|
if ((byte & 0xc0) != 0x80)
|
|
{
|
|
/* Oh, oh. An encoding error. */
|
|
errno = EILSEQ;
|
|
return (size_t) -1;
|
|
}
|
|
|
|
ps->value <<= 6;
|
|
ps->value |= byte & 0x3f;
|
|
|
|
if (--ps->count == 0)
|
|
{
|
|
/* The character is finished. */
|
|
if (pwc != NULL)
|
|
*pwc = (wchar_t) ps->value;
|
|
return ps->value ? used : 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
return (size_t) -2;
|
|
}
|