From 5d75d9bf3d3476a92d54d63b5080a59e615fdd9b Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 5 Jun 2008 05:03:46 +0000 Subject: * ext/iconv/iconv.c (iconv_create): find encoding without options. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/iconv/iconv.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 37bfab5882..2c29c2de99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jun 5 14:03:44 2008 Nobuyoshi Nakada + + * ext/iconv/iconv.c (iconv_create): find encoding without options. + Thu Jun 5 07:48:32 2008 Koichi Sasada * string.c (hash): should be "static". diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 3aaf08fbd1..1f0ab84f06 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -158,7 +158,13 @@ iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx) const char* fromcode = map_charset(&from); iconv_t cd; - *idx = rb_enc_find_index(tocode); + if ((*idx = rb_enc_find_index(tocode)) < 0) { + const char *slash = strchr(tocode, '/'); + if (slash && slash[1] == '/') { + VALUE tmp = rb_str_new(tocode, slash - tocode); + *idx = rb_enc_find_index(RSTRING_PTR(tmp)); + } + } cd = iconv_open(tocode, fromcode); if (cd == (iconv_t)-1) { -- cgit v1.2.3