From ec4af34efbe971cf48b600688b9356e3513e93bc Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 8 Aug 2017 10:43:19 +0000
Subject: dir.c: fix up r59527

* dir.c (glob_helper): fix up r59527, dot files other than current
  directory should not be included unless FNM_DOTMATCH is given.
  [ruby-core:82266] [Bug #13785]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 dir.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dir.c')

diff --git a/dir.c b/dir.c
index 39f1ca0252..b7afaec4e0 100644
--- a/dir.c
+++ b/dir.c
@@ -2070,7 +2070,8 @@ glob_helper(
 		if (p->type == RECURSIVE) {
 		    if (new_pathtype == path_directory || /* not symlink but real directory */
 			new_pathtype == path_exist) {
-			if (dotfile < 2) *new_end++ = p; /* append recursive pattern */
+			if (dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1))
+			    *new_end++ = p; /* append recursive pattern */
 		    }
 		    p = p->next; /* 0 times recursion */
 		}
-- 
cgit v1.2.3