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

ruby.c: script __dir__ encoding

Browse source 
* ruby.c (process_options): fallback to the encoding of the script
  name since rb_realpath_internal() cannot convert the encoding
  when it is ASCII-8BIT.

* test/ruby/test_rubyoptions.rb (test___dir__encoding): explicitly
  pass environment variables for locale as they are overriden by
  invoke_ruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-12-16 13:25:11 +00:00
parent 316f58076d
commit b7d6b2299b
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ruby.c
View file

@ -1744,6 +1744,9 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
path = str_conv_enc(path, uenc, lenc);
}
#endif
if (!ENCODING_GET(path)) { /* ASCII-8BIT */
rb_enc_copy(path, opt->script_name);
}
}
base_block = toplevel_context(toplevel_binding);
iseq = rb_iseq_new_main(ast->root, opt->script_name, path, vm_block_iseq(base_block));

9
test/ruby/test_rubyoptions.rb
View file

@ -952,16 +952,21 @@ class TestRubyOptions < Test::Unit::TestCase
end
def test___dir__encoding
lang = {"LC_ALL"=>ENV["LC_ALL"]||ENV["LANG"]}
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
if __FILE__.encoding == __dir__.encoding
p true
else
puts "__FILE__: \#{__FILE__.encoding}, __dir__: \#{__dir__.encoding}"
end
END
end
r, = EnvUtil.invoke_ruby("test.rb", "", true)
r, = EnvUtil.invoke_ruby([lang, "test.rb"], "", true)
assert_equal "true", r.chomp, "the encoding of __FILE__ and __dir__ should be same"
end
end