* ruby.c (process_options): no need to call rb_w32_parse_cmdline() if

unak · unak · commit 9376563a2339 · 2008-07-07T15:38:33.000Z
locale == default_external.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/win32-unicode-test@17947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul  8 00:37:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (process_options): no need to call rb_w32_parse_cmdline() if
+	  locale == default_external.
+
 Tue Jul  8 00:33:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ruby.c (process_options): re-set e_script.
diff --git a/ruby.c b/ruby.c
@@ -1102,7 +1102,8 @@ process_options(VALUE arg)
     }
     rb_enc_set_default_external(rb_enc_from_encoding(enc));
 #ifdef _WIN32
-    if ((argc = rb_w32_parse_cmdline(&argv, rb_enc_name(enc))) != 0) {
+    if (enc != lenc &&
+	(argc = rb_w32_parse_cmdline(&argv, rb_enc_name(enc))) != 0) {
 	if (opt->e_script && opt->e_script_pos) {
 	    opt->e_script = rb_str_new(0, 0);
 	    for (i = 0; i < RARRAY_LEN(opt->e_script_pos); ++i) {
