mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
a1d84548c8
2000-02-11 Ulrich Drepper <drepper@redhat.com> * stdio-common/printf-parse.h (parse_one_spec): Set wide elements. * stdio-common/printf_fp.c: Truely support wide characater output. Finally handle decimal points and thousands separator characters correctly for multibyte output. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/ieee754/ldbl-96/printf_fphex.c: Likewise. * stdio-common/vfscanf.c: Implement I modifier for numbers to read locale dependent digits. * locale/C-monetary.c (_nl_C_LC_MONETARY): Change wide character decimal point and thousands separator values to wide characters from wide character strings. * locale/C-numeric.c (_nl_C_LC_NUMERIC): Likewise. * locale/indigitswc.h: Dereference wcdigits array elements. 2000-02-03 Jakub Jelinek <jakub@redhat.com> * stdlib/canonicalize.c (canonicalize): Zero terminate path to copy on error. 2000-02-01 Cristian Gafton <gafton@redhat.com> * misc/syslog.c (closelog): Reset LogType to SOCK_DGRAM. 2000-01-31 Philip Blundell <philb@gnu.org> * sysdeps/arm/fpu/fpu_control.h (_FPU_DEFAULT): Set the AC bit. 2000-01-31 Andreas Jaeger <aj@suse.de> * intl/Makefile (generated): msgs.h is generated. * localedata/Makefile (generated-dirs): Add de_DE.437. 2000-01-31 Jakub Jelinek <jakub@redhat.com> * config.make.in: Allow default localedir to come from configure. * configure.in: Export libc_cv_localedir. * sysdeps/unix/sysv/linux/configure.in: For sparc64, put locale stuff into $exec_prefix/lib/locale because it can be shared between 32bit and 64bit libraries. * configure: Rebuilt. * sysdeps/unix/sysv/linux/configure: Rebuilt. 2000-01-31 Andreas Jaeger <aj@suse.de> * inet/tst-network.c: New file. * inet/Makefile (tests): Add tst-network. * inet/inet_net.c (inet_network): Don't overwrite memory or allow to great last digits.
89 lines
2.6 KiB
C
89 lines
2.6 KiB
C
/* Copyright (C) 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 2000.
|
|
|
|
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 <assert.h>
|
|
#include <langinfo.h>
|
|
|
|
/* Look up the value of the next multibyte character and return its numerical
|
|
value if it is one of the digits known in the locale. If *DECIDED is
|
|
-1 this means it is not yet decided which form it is and we have to
|
|
search through all available digits. Otherwise we know which script
|
|
the digits are from. */
|
|
static inline int
|
|
indigitwc_value (wchar_t wc, int *decided)
|
|
{
|
|
int from_level;
|
|
int to_level;
|
|
const wchar_t *wcdigits[10];
|
|
int n;
|
|
|
|
if (*decided != -1)
|
|
from_level = to_level = *decided;
|
|
else
|
|
{
|
|
from_level = 0;
|
|
to_level = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_INDIGITS_WC_LEN) - 1;
|
|
assert (from_level <= to_level);
|
|
}
|
|
|
|
/* In this round we get the pointer to the digit strings and also perform
|
|
the first round of comparisons. */
|
|
for (n = 0; n < 10; ++n)
|
|
{
|
|
/* Get the string for the digits with value N. */
|
|
wcdigits[n] = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n);
|
|
|
|
if (wc == *wcdigits[n])
|
|
{
|
|
/* Found it. */
|
|
if (*decided == -1)
|
|
*decided = 0;
|
|
return n;
|
|
}
|
|
|
|
/* Advance the pointer to the next string. */
|
|
++wcdigits[n];
|
|
}
|
|
|
|
/* Now perform the remaining tests. */
|
|
while (++from_level <= to_level)
|
|
{
|
|
/* Search all ten digits of this level. */
|
|
for (n = 0; n < 10; ++n)
|
|
{
|
|
if (wc == *wcdigits[n])
|
|
{
|
|
/* Found it. */
|
|
if (*decided == -1)
|
|
*decided = from_level;
|
|
return n;
|
|
}
|
|
|
|
/* Advance the pointer to the next string. */
|
|
++wcdigits[n];
|
|
}
|
|
|
|
/* Next level. */
|
|
++from_level;
|
|
}
|
|
|
|
/* If we reach this point no matching digit was found. */
|
|
return -1;
|
|
}
|