summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorshirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-16 14:06:37 +0000
committershirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-16 14:06:37 +0000
commitd1417ff8fabe8a99dc6c21830b7b3169bb03aa64 (patch)
tree66bea2d8dc0cc609df1b2e6dc0f6affb10c08d82 /dir.c
parent74477ec2b3904a0f39f11294d2bb336fb73586df (diff)
dir.c: fix Dir.glob with braces and matching dir
* dir.c (join_path_from_pattern): add the last slash for directory matching. * test/ruby/test_dir.rb (test_glob_recursive_directory): add a test for above. [ruby-core:91110] [Bug #15540] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/dir.c b/dir.c
index 2196344..7e5b807 100644
--- a/dir.c
+++ b/dir.c
@@ -2052,6 +2052,10 @@ join_path_from_pattern(struct glob_pattern **beg)
case RECURSIVE:
str = "**";
break;
+ case MATCH_DIR:
+ /* append last slash */
+ str = "";
+ break;
default:
str = p->str;
if (!str) continue;