Skip to content

Commit

Permalink
Delegates 3 arguments for Pathname.glob.
Browse files Browse the repository at this point in the history
Thanks for the patch by pocke (Masataka Kuwabara) [Feature #14405].
  • Loading branch information
akr committed Jul 14, 2019
1 parent 61577fa commit 4d9504f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ext/pathname/pathname.c
Expand Up @@ -1092,10 +1092,10 @@ s_glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
static VALUE
path_s_glob(int argc, VALUE *argv, VALUE klass)
{
VALUE args[2];
VALUE args[3];
int n;

n = rb_scan_args(argc, argv, "11", &args[0], &args[1]);
n = rb_scan_args(argc, argv, "12", &args[0], &args[1], &args[2]);
if (rb_block_given_p()) {
return rb_block_call(rb_cDir, id_glob, n, args, s_glob_i, klass);
}
Expand Down
11 changes: 11 additions & 0 deletions test/pathname/test_pathname.rb
Expand Up @@ -1251,6 +1251,17 @@ def test_s_glob
}
end

def test_s_glob_3args
with_tmpchdir('rubytest-pathname') {|dir|
open("f", "w") {|f| f.write "abc" }
Dir.chdir("/") {
assert_equal(
[Pathname("."), Pathname(".."), Pathname("f")],
Pathname.glob("*", File::FNM_DOTMATCH, base: dir).sort)
}
}
end

def test_s_getwd
wd = Pathname.getwd
assert_kind_of(Pathname, wd)
Expand Down

0 comments on commit 4d9504f

Please sign in to comment.