glibc/locale/indigits.h
Ulrich Drepper eac4282fa6 Update.
2000-07-27  Jakub Jelinek  <jakub@redhat.com>

	* locale/indigits.h (indigit_value): Correct.
	* locale/indigitswc.h (indigitwc_value): Correct.
	* stdio-common/vfscanf.c (__vfscanf): Fix I18N number
	conversion, add GROUP checking for it, fix GROUP number
	conversion with strlen(thousands) > 1.
	Honour width correctly in the presence of floating
	decimal points and thousands separators.
	* stdio-common/tst-sscanf.c: New test.
	* stdio-common/Makefile: Add it to tests.
	* sysdeps/generic/strtol.c (strtol): Fix conversion if there are
	thousands separators and group argument is non-zero.

	Reported by Andi Kleen <ak@suse.de>.
2000-07-28 17:45:15 +00:00

99 lines
2.9 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>
#include <string.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
indigit_value (const char **s, size_t *len, int *decided)
{
int from_level;
int to_level;
const char *mbdigits[10];
int i;
int n;
if (*decided != -1)
from_level = to_level = *decided;
else
{
from_level = 0;
to_level = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_INDIGITS_MB_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)
{
size_t dlen;
/* Get the string for the digits with value N. */
mbdigits[n] = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_MB + n);
dlen = strlen (mbdigits[n]);
if (from_level == 0 && dlen <= *len
&& memcmp (*s, mbdigits[n], dlen) == 0)
{
/* Found it. */
*s += dlen;
*len -= dlen;
if (*decided == -1)
*decided = 0;
return n;
}
/* Advance the pointer to the next string. */
mbdigits[n] += dlen + 1;
}
/* Now perform the remaining tests. */
for (i = 1; i <= to_level; ++i)
{
/* Search all ten digits of this level. */
for (n = 0; n < 10; ++n)
{
size_t dlen = strlen (mbdigits[n]);
if (i >= from_level && dlen <= *len
&& memcmp (*s, mbdigits[n], dlen) == 0)
{
/* Found it. */
*s += dlen;
*len -= dlen;
if (*decided == -1)
*decided = from_level;
return n;
}
/* Advance the pointer to the next string. */
mbdigits[n] += dlen + 1;
}
}
/* If we reach this point no matching digit was found. */
return -1;
}