diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 15:11:24 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 15:11:24 +0000 |
| commit | e93acb4d8207f6c0ce89efcc08669241e7a52cc8 (patch) | |
| tree | a1772ee9d0fbd25ca76933e5c57076fcd12fce7a | |
| parent | 050962abe422ef3b36e4ae010da9ebbc94b2e408 (diff) | |
| download | glibc-e93acb4d8207f6c0ce89efcc08669241e7a52cc8.tar.gz glibc-e93acb4d8207f6c0ce89efcc08669241e7a52cc8.tar.xz glibc-e93acb4d8207f6c0ce89efcc08669241e7a52cc8.zip | |
2007-04-25 Ulrich Drepper <drepper@redhat.com>
[BZ #4406] * iconv/gconv_charset.h (strip): Allow ':' * iconv/iconv_open.c (iconv_open): Adjust comment.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | iconv/gconv_charset.h | 2 | ||||
| -rw-r--r-- | iconv/iconv_open.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1b1e170ad8..b718ebbef9 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 c18abec578..3aea7e5262 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 e0f6135575..0d2ced1561 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); |