summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-07 11:39:29 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-07 11:39:29 +0000
commitc4d502c93150ca3eba4612956dd63915f3b0610c (patch)
tree2cbc3ff6191d34cf69e1d2aee5dce2168e2e5e0d
parente735472d1f22fca2e2103b6d3868c101c54a2e2d (diff)
* ext/iconv/iconv.c (map_charset): make case sensitive.
ext/iconv/charset_alias.rb (charset_alias): don't ignore config.charset's information. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/iconv/charset_alias.rb3
-rw-r--r--ext/iconv/iconv.c6
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a8bb1550a..7e40485431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 7 20:36:42 2003 Tanaka Akira <akr@m17n.org>
+
+ * ext/iconv/iconv.c (map_charset): make case sensitive.
+ ext/iconv/charset_alias.rb (charset_alias): don't ignore
+ config.charset's information.
+
Sat Dec 6 22:58:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ssl.c (ossl_start_ssl): new function to wrap
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index 48f0fae5f9..62742e62a8 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -14,8 +14,7 @@ def charset_alias(config_charset, mapfile, target = OS)
next comments << list if /^\#/ =~ list
next unless /^(\S+)\s+(\S+)$/ =~ list
sys, can = $1, $2
- next if sys == can
- next if can.downcase! and sys == can
+ can.downcase!
map[can] = sys
end
case target
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 8e978b8730..90bf024afb 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -110,9 +110,9 @@ map_charset
VALUE val = *code;
if (RHASH(charset_map)->tbl && RHASH(charset_map)->tbl->num_entries) {
- val = rb_funcall2(val, rb_intern("downcase"), 0, 0);
- StringValuePtr(val);
- if (st_lookup(RHASH(charset_map)->tbl, val, &val)) {
+ VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
+ StringValuePtr(key);
+ if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
StringValuePtr(val);
*code = val;
}