ruby-changes:3571
From: ko1@a...
Date: Tue, 15 Jan 2008 16:59:58 +0900 (JST)
Subject: [ruby-changes:3571] nobu - Ruby:r15060 (trunk): * ruby.c (proc_options): encoding libraries cannot be loaded until
nobu 2008-01-15 16:59:33 +0900 (Tue, 15 Jan 2008) New Revision: 15060 Modified files: trunk/ChangeLog trunk/ruby.c Log: * ruby.c (proc_options): encoding libraries cannot be loaded until load path is set. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ruby.c?r1=15060&r2=15059&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15060&r2=15059&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 15059) +++ ChangeLog (revision 15060) @@ -1,3 +1,8 @@ +Tue Jan 15 16:59:31 2008 Nobuyoshi Nakada <nobu@r...> + + * ruby.c (proc_options): encoding libraries cannot be loaded until + load path is set. + Tue Jan 15 15:09:28 2008 Nobuyoshi Nakada <nobu@r...> * win32/setup.mak: strip out empty lines from CPP output. Index: ruby.c =================================================================== --- ruby.c (revision 15059) +++ ruby.c (revision 15060) @@ -707,24 +707,23 @@ case 'K': if (*++s) { - rb_encoding *enc = 0; + const char *enc_name = 0; switch (*s) { case 'E': case 'e': - enc = rb_enc_find("EUC-JP"); + enc_name = "EUC-JP"; break; case 'S': case 's': - enc = rb_enc_find("Windows-31J"); - if (!enc) enc = rb_enc_find("Shift_JIS"); + enc_name = "Windows-31J"; break; case 'U': case 'u': - enc = ONIG_ENCODING_UTF8; + enc_name = "UTF-8"; break; case 'N': case 'n': case 'A': case 'a': - enc = ONIG_ENCODING_ASCII; + enc_name = "US-ASCII"; break; } - if (enc) { - opt->enc_name = rb_str_new2(rb_enc_name(enc)); + if (enc_name) { + opt->enc_name = rb_str_new2(enc_name); } s++; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/