8000 * ruby.c (process_options): no need to call rb_w32_parse_cmdline() if · jruby/ruby@9376563 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9376563

Browse files
unakunak
committed
* ruby.c (process_options): no need to call rb_w32_parse_cmdline() if
 locale == default_external. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/win32-unicode-test@17947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent f0248e8 commit 9376563

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

‎ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Tue Jul 8 00:37:50 2008 NAKAMURA Usaku <usa@ruby-lang.org>
2+
3+
* ruby.c (process_options): no need to call rb_w32_parse_cmdline() if
4+
locale == default_external.
5+
16< 9A79 /code>
Tue Jul 8 00:33:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
27

38
* ruby.c (process_options): re-set e_script.

‎ruby.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,8 @@ process_options(VALUE arg)
11021102
}
11031103
rb_enc_set_default_external(rb_enc_from_encoding(enc));
11041104
#ifdef _WIN32
1105-
if ((argc = rb_w32_parse_cmdline(&argv, rb_enc_name(enc))) != 0) {
1105+
if (enc != lenc &&
1106+
(argc = rb_w32_parse_cmdline(&argv, rb_enc_name(enc))) != 0) {
11061107
if (opt->e_script && opt->e_script_pos) {
11071108
opt->e_script = rb_str_new(0, 0);
11081109
for (i = 0; i < RARRAY_LEN(opt->e_script_pos); ++i) {

0 commit comments

Comments
 (0)
0