Locale-independent parsing in libintl

(cherry picked from commit 89edf2e9119b57fc404891670d2bc47bdfdb61ef)

diff --git a/ChangeLog b/ChangeLog
index 0be6e1bf3298319d019f03ef7a70fbf20ac7eebb..aeb7f836cbd4207772b495d875d8ac8b6726b210 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-11  Ulrich Drepper  <drepper@gmail.com>
+
+       * intl/l10nflist.c (_nl_make_l10nflist): Use locale-independent
+       classification.
+
 2011-07-22  Andreas Schwab  <schwab@redhat.com>
 
        * resolv/res_init.c (__res_vinit): Properly tokenize nameserver

diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 2c06a91113b6015088580b8a4c41189222278937..a38e0efe90913e1e6daa91725f132705b3911feb 100644 (file)
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -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';