From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 25 Apr 2007 15:15:47 +0000 (+0000)
Subject: [BZ #4406]
X-Git-Tag: cvs/fedora-glibc-20070504T0917~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba508da3ad6c687cd618bd725b0269c1d024edeb;p=platform%2Fupstream%2Fglibc.git

[BZ #4406]

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 e1324c8..770fb73 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-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* libio/bits/stdio.h (fgetc_unlocked): Add extern inline optimized
diff --git a/iconv/iconv_open.c b/iconv/iconv_open.c
index e0f6135..fc94fa5 100644
--- a/iconv/iconv_open.c
+++ b/iconv/iconv_open.c
@@ -1,5 +1,5 @@
 /* Get descriptor for character set conversion.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,1999,2000,2001,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -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);