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 1b1e170ad890e7759db8a4c0a73a70b06e9bf267..b718ebbef9e8b8c2abc32c0d668dd92157ba5714 100644 (file)
--- 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 c18abec57871c4efa3d77101f65d964b09e0d8af..3aea7e52623d12a14f223b832bb63b15b73ee731 100644 (file)
--- 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 e0f61355751cc3220e277ee3c6177cee0b31cd48..0d2ced156153763d5e001228839ae1b17561b850 100644 (file)
--- 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);