Windows: Change command line interface to UTF-8

- script name
- include paths
- script input from stdin

Author: larskanis

ruby.c

@@ -2138,7 +2138,7 @@ prism_script(ruby_cmdline_options_t *opt, pm_parse_result_t *result)
     const bool read_stdin = (strcmp(opt->script, "-") == 0);
 
     if (read_stdin) {
-        pm_options_encoding_set(options, rb_enc_name(rb_locale_encoding()));
+        pm_options_encoding_set(options, rb_enc_name(IF_UTF8_PATH(rb_utf8_encoding(), rb_locale_encoding())));
     }
     if (opt->src.enc.name != 0) {
         pm_options_encoding_set(options, StringValueCStr(opt->src.enc.name));
@@ -2408,14 +2408,8 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 #endif
     }
     rb_enc_associate(opt->script_name, IF_UTF8_PATH(uenc, lenc));
-#if UTF8_PATH
-    if (uenc != lenc) {
-        opt->script_name = str_conv_enc(opt->script_name, uenc, lenc);
-        opt->script = RSTRING_PTR(opt->script_name);
-    }
-#endif
     rb_obj_freeze(opt->script_name);
-    if (IF_UTF8_PATH(uenc != lenc, 1)) {
+    {
         long i;
         VALUE load_path = vm->load_path;
         const ID id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK;
@@ -2425,13 +2419,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
         for (i = 0; i < RARRAY_LEN(load_path); ++i) {
             VALUE path = RARRAY_AREF(load_path, i);
             int mark = rb_attr_get(path, id_initial_load_path_mark) == path;
-#if UTF8_PATH
-            VALUE newpath = rb_str_conv_enc(path, uenc, lenc);
-            if (newpath == path) continue;
-            path = newpath;
-#else
-            if (!(path = copy_str(path, lenc, !mark))) continue;
-#endif
+            if (!(path = copy_str(path, IF_UTF8_PATH(uenc, lenc), !mark))) continue;
             if (mark) rb_ivar_set(path, id_initial_load_path_mark, path);
             if (!modifiable) {
                 rb_ary_modify(load_path);
@@ -2559,11 +2547,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
         VALUE path = Qnil;
         if (!opt->e_script && strcmp(opt->script, "-")) {
             path = rb_realpath_internal(Qnil, opt->script_name, 1);
-#if UTF8_PATH
-            if (uenc != lenc) {
-                path = str_conv_enc(path, uenc, lenc);
-            }
-#endif
             if (!ENCODING_GET(path)) { /* ASCII-8BIT */
                 rb_enc_copy(path, opt->script_name);
             }
@@ -2725,7 +2708,7 @@ load_file_internal(VALUE argp_v)
         enc = rb_enc_from_index(opt->src.enc.index);
     }
     else if (f == rb_stdin) {
-        enc = rb_locale_encoding();
+        enc = IF_UTF8_PATH(rb_utf8_encoding(), rb_locale_encoding());
     }
     else {
         enc = rb_utf8_encoding();

test/ruby/test_rubyoptions.rb

@@ -1028,19 +1028,11 @@ def test_command_line_glob_nonascii
 
     def test_command_line_progname_nonascii
       bug10555 = '[ruby-dev:48752] [Bug #10555]'
-      name = expected = nil
-      unless (0x80..0x10000).any? {|c|
-               name = c.chr(Encoding::UTF_8)
-               expected = name.encode("locale") rescue nil
-             }
-        omit "can't make locale name"
-      end
-      name << ".rb"
-      expected << ".rb"
+      name = "\u{20ac}.rb"
       with_tmpchdir do |dir|
         open(name, "w") {|f| f.puts "puts File.basename($0)"}
-        assert_in_out_err([name], "", [expected], [],
-                          bug10555, encoding: "locale")
+        assert_in_out_err([name], "", [name], [],
+                          bug10555, encoding: "utf-8")
       end
     end