picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Locale-independent parsing in libintl

Browse source
This commit is contained in:
Ulrich Drepper 2011-08-11 14:04:08 -04:00
parent 2df1f7be58
commit 89edf2e911
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-08-11 Ulrich Drepper <drepper@gmail.com>
* intl/l10nflist.c (_nl_make_l10nflist): Use locale-independent
classification.
2011-08-10 Andreas Schwab <schwab@redhat.com>
* include/dirent.h: Add libc_hidden_proto for scandirat and

12
intl/l10nflist.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1995-2002, 2004, 2005 Free Software Foundation, Inc.
/* Copyright (C) 1995-2002, 2004, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@ -134,7 +134,7 @@ argz_next__ (argz, argz_len, entry)
if (entry)
{
if (entry < argz + argz_len)
entry = strchr (entry, '\0') + 1;
entry = strchr (entry, '\0') + 1;
return entry >= argz + argz_len ? NULL : (char *) entry;
}
@ -334,11 +334,11 @@ _nl_normalize_codeset (codeset, name_len)
size_t cnt;
for (cnt = 0; cnt < name_len; ++cnt)
if (isalnum ((unsigned char) codeset[cnt]))
if (__isalnum_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
{
++len;
if (isalpha ((unsigned char) codeset[cnt]))
if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
only_digit = 0;
}
@ -352,9 +352,9 @@ _nl_normalize_codeset (codeset, name_len)
wp = retval;
for (cnt = 0; cnt < name_len; ++cnt)
if (isalpha ((unsigned char) codeset[cnt]))
if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
*wp++ = tolower ((unsigned char) codeset[cnt]);
else if (isdigit ((unsigned char) codeset[cnt]))
else if (__isdigit_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
*wp++ = codeset[cnt];
*wp = '\0';