[PATCH] Normalize locale names independent of current locale

[Andreas Schwab <schwab@redhat.com>]

2011-08-10  Andreas Schwab  <schwab@redhat.com>

	* intl/l10nflist.c (_nl_normalize_codeset): Use locale-independent
	conversions.
---
 intl/l10nflist.c |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 2c06a91..2a5e038 100644
--- 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.
 
@@ -332,15 +332,21 @@ _nl_normalize_codeset (codeset, name_len)
   char *retval;
   char *wp;
   size_t cnt;
+  char c;
 
   for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum ((unsigned char) codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha ((unsigned char) codeset[cnt]))
-	  only_digit = 0;
-      }
+    {
+      c = codeset[cnt];
+      if ((c >= '0' && c <= '9')
+	  || (c >= 'A' && c <= 'Z')
+	  || (c >= 'a' && c <= 'z'))
+	{
+	  ++len;
+
+	  if (!(c >= '0' && c <= '9'))
+	    only_digit = 0;
+	}
+    }
 
   retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
 
@@ -352,10 +358,13 @@ _nl_normalize_codeset (codeset, name_len)
 	wp = retval;
 
       for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha ((unsigned char) codeset[cnt]))
-	  *wp++ = tolower ((unsigned char) codeset[cnt]);
-	else if (isdigit ((unsigned char) codeset[cnt]))
-	  *wp++ = codeset[cnt];
+	{
+	  c = codeset[cnt];
+	  if (c >= 'A' && c <= 'Z')
+	    *wp++ = c - 'A' + 'a';
+	  else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z'))
+	    *wp++ = codeset[cnt];
+	}
 
       *wp = '\0';
     }
-- 
1.7.6


-- 
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."