mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* prelude.rb (require_relative): use File.realpath. [ruby-dev:40040]
* include/ruby/intern.h: declare rb_dir_getwd. * dir.c (rb_dir_getwd): copied from dir_s_getwd to export. (dir_s_getwd): use rb_dir_getwd. * file.c (rb_file_s_realpath): new method File.realpath. (rb_file_s_realdirpath): new method File.realdirpath. * lib/pathname.rb (Pathname#realpath): use File.realpath. (Pathname#realdirpath): use File.realdirpath. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f86cca6f55
commit
853dd6cabe
8 changed files with 198 additions and 69 deletions
|
|
@ -32,7 +32,7 @@ module Kernel
|
|||
if /\A\((.*)\)/ =~ file # eval, etc.
|
||||
raise LoadError, "require_relative is called in #{$1}"
|
||||
end
|
||||
absolute_feature = File.expand_path(File.join(File.dirname(file), relative_feature))
|
||||
absolute_feature = File.join(File.dirname(File.realpath(file)), relative_feature)
|
||||
require absolute_feature
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue