From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 12 Jul 2007 15:11:24 +0000 (+0000)
Subject: 2007-04-25  Ulrich Drepper  <drepper@redhat.com>
X-Git-Tag: cvs/fedora-glibc-2_5-20070712T1701~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e93acb4d8207f6c0ce89efcc08669241e7a52cc8;p=thirdparty%2Fglibc.git

2007-04-25  Ulrich Drepper  <drepper@redhat.com>

	[BZ #4406]
	* iconv/gconv_charset.h (strip): Allow ':'
	* iconv/iconv_open.c (iconv_open): Adjust comment.
---

diff --git a/ChangeLog b/ChangeLog
index 1b1e170ad89..b718ebbef9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-25  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #4406]
+	* iconv/gconv_charset.h (strip): Allow ':'
+	* iconv/iconv_open.c (iconv_open): Adjust comment.
+
 2007-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #4405]
diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index c18abec5787..3aea7e52623 100644
--- a/iconv/gconv_charset.h
+++ b/iconv/gconv_charset.h
@@ -30,7 +30,7 @@ strip (char *wp, const char *s)
   while (*s != '\0')
     {
       if (__isalnum_l (*s, _nl_C_locobj_ptr)
-	  || *s == '_' || *s == '-' || *s == '.' || *s == ',')
+	  || *s == '_' || *s == '-' || *s == '.' || *s == ',' || *s == ':')
 	*wp++ = __toupper_l (*s, _nl_C_locobj_ptr);
       else if (*s == '/')
 	{
diff --git a/iconv/iconv_open.c b/iconv/iconv_open.c
index e0f61355751..0d2ced15615 100644
--- a/iconv/iconv_open.c
+++ b/iconv/iconv_open.c
@@ -38,7 +38,7 @@ iconv_open (const char *tocode, const char *fromcode)
   int res;
 
   /* Normalize the name.  We remove all characters beside alpha-numeric,
-     '_', '-', '/', and '.'.  */
+     '_', '-', '/', '.', and ':'.  */
   tocode_len = strlen (tocode);
   tocode_conv = (char *) alloca (tocode_len + 3);
   strip (tocode_conv, tocode);