From 43760f05137e8ad950045a6f8d1e33f8515d666e Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 15 Jan 2008 07:59:33 +0000 Subject: * ruby.c (proc_options): encoding libraries cannot be loaded until load path is set. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index 20a2a9083..356bd4eed 100644 --- a/ruby.c +++ b/ruby.c @@ -707,24 +707,23 @@ proc_options(int argc, char **argv, struct cmdline_options *opt) 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++; } -- cgit