зеркало из https://github.com/github/ruby.git
* ruby.c (proc_options): encoding libraries cannot be loaded until
load path is set. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
9615084012
Коммит
9eab65b3f0
|
@ -1,3 +1,8 @@
|
||||||
|
Tue Jan 15 16:59:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* ruby.c (proc_options): encoding libraries cannot be loaded until
|
||||||
|
load path is set.
|
||||||
|
|
||||||
Tue Jan 15 15:09:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Tue Jan 15 15:09:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* win32/setup.mak: strip out empty lines from CPP output.
|
* win32/setup.mak: strip out empty lines from CPP output.
|
||||||
|
|
15
ruby.c
15
ruby.c
|
@ -707,24 +707,23 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
|
||||||
|
|
||||||
case 'K':
|
case 'K':
|
||||||
if (*++s) {
|
if (*++s) {
|
||||||
rb_encoding *enc = 0;
|
const char *enc_name = 0;
|
||||||
switch (*s) {
|
switch (*s) {
|
||||||
case 'E': case 'e':
|
case 'E': case 'e':
|
||||||
enc = rb_enc_find("EUC-JP");
|
enc_name = "EUC-JP";
|
||||||
break;
|
break;
|
||||||
case 'S': case 's':
|
case 'S': case 's':
|
||||||
enc = rb_enc_find("Windows-31J");
|
enc_name = "Windows-31J";
|
||||||
if (!enc) enc = rb_enc_find("Shift_JIS");
|
|
||||||
break;
|
break;
|
||||||
case 'U': case 'u':
|
case 'U': case 'u':
|
||||||
enc = ONIG_ENCODING_UTF8;
|
enc_name = "UTF-8";
|
||||||
break;
|
break;
|
||||||
case 'N': case 'n': case 'A': case 'a':
|
case 'N': case 'n': case 'A': case 'a':
|
||||||
enc = ONIG_ENCODING_ASCII;
|
enc_name = "US-ASCII";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (enc) {
|
if (enc_name) {
|
||||||
opt->enc_name = rb_str_new2(rb_enc_name(enc));
|
opt->enc_name = rb_str_new2(enc_name);
|
||||||
}
|
}
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче