kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

The encoding of __FILE__ and __dir__ should be same

Browse source 
* 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
This commit is contained in:
usa 2017-10-21 15:43:05 +00:00
parent 8949479e1a
commit 3e8c0c577c
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ruby.c
View file

@ -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));

16
test/ruby/test_rubyoptions.rb
View file

@ -935,4 +935,20 @@ class TestRubyOptions < Test::Unit::TestCase
end
end
end
def test___dir__encoding
with_tmpchdir do
testdir = "\u30c6\u30b9\u30c8"
Dir.mkdir(testdir)
Dir.chdir(testdir) do
open("test.rb", "w") do |f|
f.puts <<-END
p __FILE__.encoding == __dir__.encoding
END
end
r, = EnvUtil.invoke_ruby("test.rb", "", true)
assert_equal "true", r.chomp, "the encoding of __FILE__ and __dir__ should be same"
end
end
end
end