[ruby-dev:22175] Re: iconv map_charset on Solaris

In article <[e-mail]>,
  Tanaka Akira <[e-mail]> writes:

> あと、iconv.c:map_charset でも表に載っていなかった時はユーザが与えた通
> りの case で返すべきかも知れません。

こっちの方針なら

Index: ext/iconv/charset_alias.rb
===================================================================
RCS file: /src/ruby/ext/iconv/charset_alias.rb,v
retrieving revision 1.2
diff -u -r1.2 charset_alias.rb
--- ext/iconv/charset_alias.rb	1 Sep 2003 15:41:31 -0000	1.2
+++ ext/iconv/charset_alias.rb	6 Dec 2003 14:49:36 -0000
@@ -14,8 +14,8 @@
     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!
+    next if can.upcase == can && can == sys
     map[can] = sys
   end
   case target
Index: ext/iconv/iconv.c
===================================================================
RCS file: /src/ruby/ext/iconv/iconv.c,v
retrieving revision 1.12
diff -u -r1.12 iconv.c
--- ext/iconv/iconv.c	2 Oct 2003 11:33:52 -0000	1.12
+++ ext/iconv/iconv.c	6 Dec 2003 14:49:36 -0000
@@ -110,9 +110,9 @@
     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;
 	}

という感じかなぁ。

こうすると ISO8859-9 のような、Solaris で提供されている大文字の非 MIME
charset な code が使えるようになります。
-- 
[田中 哲][たなか あきら][Tanaka Akira]