diff options
-rw-r--r-- | file.c | 16 | ||||
-rw-r--r-- | test/ruby/test_file.rb | 8 |
2 files changed, 19 insertions, 5 deletions
@@ -3943,7 +3943,7 @@ enum rb_realpath_mode { }; static int -realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, +realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE fallback, VALUE loopcheck, enum rb_realpath_mode mode, int last) { const char *pend = unresolved + strlen(unresolved); @@ -4001,6 +4001,12 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, ret = lstat_without_gvl(RSTRING_PTR(testpath), &sbuf); if (ret == -1) { int e = errno; + if (e == ENOENT && !NIL_P(fallback)) { + if (stat_without_gvl(RSTRING_PTR(fallback), &sbuf) == 0) { + rb_str_replace(*resolvedp, fallback); + return 0; + } + } if (mode == RB_REALPATH_CHECK) return -1; if (e == ENOENT) { if (mode == RB_REALPATH_STRICT || !last || *unresolved_firstsep) @@ -4032,7 +4038,7 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, *resolvedp = link; *prefixlenp = link_prefixlen; } - if (realpath_rec(prefixlenp, resolvedp, link_names, + if (realpath_rec(prefixlenp, resolvedp, link_names, testpath, loopcheck, mode, !*unresolved_firstsep)) return -1; RB_GC_GUARD(link_orig); @@ -4121,14 +4127,14 @@ rb_check_realpath_internal(VALUE basedir, VALUE path, enum rb_realpath_mode mode loopcheck = rb_hash_new(); if (curdir_names) { - if (realpath_rec(&prefixlen, &resolved, curdir_names, loopcheck, mode, 0)) + if (realpath_rec(&prefixlen, &resolved, curdir_names, Qnil, loopcheck, mode, 0)) return Qnil; } if (basedir_names) { - if (realpath_rec(&prefixlen, &resolved, basedir_names, loopcheck, mode, 0)) + if (realpath_rec(&prefixlen, &resolved, basedir_names, Qnil, loopcheck, mode, 0)) return Qnil; } - if (realpath_rec(&prefixlen, &resolved, path_names, loopcheck, mode, 1)) + if (realpath_rec(&prefixlen, &resolved, path_names, Qnil, loopcheck, mode, 1)) return Qnil; if (origenc != rb_enc_get(resolved)) { diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index 9f09ac6fd1..89757287d1 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -303,6 +303,14 @@ class TestFile < Test::Unit::TestCase } end + def test_realpath_special_symlink + IO.pipe do |r, w| + if File.pipe?(path = "/dev/fd/#{r.fileno}") + assert_file.identical?(File.realpath(path), path) + end + end + end + def test_realdirpath Dir.mktmpdir('rubytest-realdirpath') {|tmpdir| realdir = File.realpath(tmpdir) |