diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-21 15:43:05 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-21 15:43:05 +0000 |
commit | 3e8c0c577cde58cc00d975d533b9416a80ba12ec (patch) | |
tree | 0601ebfa914ea4441ab7c6115c075c52a050ae9f /ruby.c | |
parent | 8949479e1a77ad62c054cd2db9b129f65c560f90 (diff) |
The encoding of __FILE__ and __dir__ should be same
* ruby.c (process_options): convert the real path of the script to locale
encoding if its encoding is not locale (maybe UTF-8) on Windows/OS X.
this change makes the encoding of __dir__ to the same encoding of __FILE__
when the script name is passed from commandline.
* test/ruby/test_options.rb (test___dir__encoding): test for this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1737,6 +1737,11 @@ 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, script_name, 1); +#if UTF8_PATH + if (uenc != lenc) { + path = str_conv_enc(path, uenc, lenc); + } +#endif } base_block = toplevel_context(toplevel_binding); iseq = rb_iseq_new_main(tree, opt->script_name, path, vm_block_iseq(base_block)); |