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

dir.c: relative path Dir base

Browse source 
* dir.c (glob_helper): fix globbing based on a relative path Dir.
  [Feature #13056]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-08-03 03:39:33 +00:00
parent 6c676acfa2
commit 1ef613dd0b
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dir.c
View file

@ -1896,6 +1896,9 @@ glob_helper(
int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0; int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
int escape = !(flags & FNM_NOESCAPE); int escape = !(flags & FNM_NOESCAPE);
size_t pathlen = baselen + namelen; size_t pathlen = baselen + namelen;
const char *base = path;
if (fd != AT_FDCWD && *(base += baselen) == '/') base++;
for (cur = beg; cur < end; ++cur) { for (cur = beg; cur < end; ++cur) {
struct glob_pattern *p = *cur; struct glob_pattern *p = *cur;
@ -1928,9 +1931,9 @@ glob_helper(
} }
} }
if (*path) { if (*base) {
if (match_all && pathtype == path_unknown) { if (match_all && pathtype == path_unknown) {
if (do_lstat(fd, path, &st, flags, enc) == 0) { if (do_lstat(fd, base, &st, flags, enc) == 0) {
pathtype = IFTODT(st.st_mode); pathtype = IFTODT(st.st_mode);
} }
else { else {
@ -1938,7 +1941,7 @@ glob_helper(
} }
} }
if (match_dir && pathtype == path_unknown) { if (match_dir && pathtype == path_unknown) {
if (do_stat(fd, path, &st, flags, enc) == 0) { if (do_stat(fd, base, &st, flags, enc) == 0) {
pathtype = IFTODT(st.st_mode); pathtype = IFTODT(st.st_mode);
} }
else { else {
@ -1980,7 +1983,7 @@ glob_helper(
# else # else
; ;
# endif # endif
dirp = do_opendir(fd, *path ? path : ".", flags, enc, funcs->error, arg, &status); dirp = do_opendir(fd, *base ? base : ".", flags, enc, funcs->error, arg, &status);
if (dirp == NULL) { if (dirp == NULL) {
# if FNM_SYSCASE || NORMALIZE_UTF8PATH # if FNM_SYSCASE || NORMALIZE_UTF8PATH
if ((magical < 2) && !recursive && (errno == EACCES)) { if ((magical < 2) && !recursive && (errno == EACCES)) {
@ -1990,7 +1993,7 @@ glob_helper(
# endif # endif
return status; return status;
} }
IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : ".")); IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *base ? base : "."));
# if NORMALIZE_UTF8PATH # if NORMALIZE_UTF8PATH
if (!(norm_p || magical || recursive)) { if (!(norm_p || magical || recursive)) {

2
test/ruby/test_dir.rb
View file

@ -207,6 +207,7 @@ class TestDir < Test::Unit::TestCase
files.each {|n| File.write(File.join(@root, n), "")} files.each {|n| File.write(File.join(@root, n), "")}
assert_equal(files, Dir.glob("*/*.c", base: @root).sort) assert_equal(files, Dir.glob("*/*.c", base: @root).sort)
assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: ".").sort}) assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: ".").sort})
assert_equal(%w[foo.c], Dir.chdir(@root) {Dir.glob("*.c", base: "a").sort})
assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: "").sort}) assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: "").sort})
assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: nil).sort}) assert_equal(files, Dir.chdir(@root) {Dir.glob("*/*.c", base: nil).sort})
end end
@ -215,6 +216,7 @@ class TestDir < Test::Unit::TestCase
files = %w[a/foo.c c/bar.c] files = %w[a/foo.c c/bar.c]
files.each {|n| File.write(File.join(@root, n), "")} files.each {|n| File.write(File.join(@root, n), "")}
assert_equal(files, Dir.open(@root) {|d| Dir.glob("*/*.c", base: d)}.sort) assert_equal(files, Dir.open(@root) {|d| Dir.glob("*/*.c", base: d)}.sort)
assert_equal(%w[foo.c], Dir.chdir(@root) {Dir.open("a") {|d| Dir.glob("*", base: d)}})
end end
def assert_entries(entries, children = false) def assert_entries(entries, children = false)