diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-19 21:43:39 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-19 21:43:39 +0000 |
commit | ce6fdd55bd0e892f75760bb50aec29dd063dfcea (patch) | |
tree | df01a68eedaa0f2d42ed8b38b4e4a294dc9fbc53 /ruby.c | |
parent | 0844dbdc372fe4f1d48fba8a28f2e5867ede1fec (diff) |
merge revision(s) 54785: [Backport #11900]
* ruby.c (process_options): convert -e script to the encoding
given by a command line option on Windows. assume it is the
expected encoding. [ruby-dev:49461] [Bug #11900]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 21 |
1 files changed, 19 insertions, 2 deletions
@@ -1368,6 +1368,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt) VALUE parser; const rb_iseq_t *iseq; rb_encoding *enc, *lenc; +#if UTF8_PATH + rb_encoding *uenc, *ienc = 0; +#endif const char *s; char fbuf[MAXPATHLEN]; int i = (int)proc_options(argc, argv, opt, 0); @@ -1478,6 +1481,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt) enc = rb_enc_from_index(opt->intern.enc.index); rb_enc_set_default_internal(rb_enc_from_encoding(enc)); opt->intern.enc.index = -1; +#if UTF8_PATH + ienc = enc; +#endif } rb_enc_associate(opt->script_name, lenc); rb_obj_freeze(opt->script_name); @@ -1512,8 +1518,11 @@ process_options(int argc, char **argv, struct cmdline_options *opt) #undef SET_COMPILE_OPTION } #if UTF8_PATH - opt->script_name = str_conv_enc(opt->script_name, rb_utf8_encoding(), lenc); - opt->script = RSTRING_PTR(opt->script_name); + uenc = rb_utf8_encoding(); + if (uenc != lenc) { + opt->script_name = str_conv_enc(opt->script_name, uenc, lenc); + opt->script = RSTRING_PTR(opt->script_name); + } #endif ruby_set_argv(argc, argv); process_sflag(&opt->sflag); @@ -1537,7 +1546,15 @@ process_options(int argc, char **argv, struct cmdline_options *opt) } else { eenc = lenc; +#if UTF8_PATH + if (ienc) eenc = ienc; +#endif } +#if UTF8_PATH + if (eenc != uenc) { + opt->e_script = str_conv_enc(opt->e_script, uenc, eenc); + } +#endif rb_enc_associate(opt->e_script, eenc); if (!(opt->dump & ~DUMP_BIT(version_v))) { ruby_set_script_name(opt->script_name); |