From 517cda383217ae4c68c5782429a5dbc4962b407a Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sun, 15 Apr 2018 10:56:35 -0700
Subject: 42636: fix GLOB_DOTS for !(RM_STAR_SILENT)

Also fix paste-o in older log entry
---
 Src/utils.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Src')

diff --git a/Src/utils.c b/Src/utils.c
index 180693d67..cb292a050 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2775,10 +2775,11 @@ checkrmall(char *s)
     const int max_count = 100;
     if ((rmd = opendir(unmeta(s)))) {
 	int ignoredots = !isset(GLOBDOTS);
-	/* ### TODO: Passing ignoredots here is wrong.  See workers/41672
-	   aka <https://bugs.debian.org/875460>.
-	 */
-	while (zreaddir(rmd, ignoredots)) {
+	char *fname;
+
+	while (fname = zreaddir(rmd, 1)) {
+	    if (ignoredots && *fname == '.')
+		continue;
 	    count++;
 	    if (count > max_count)
 		break;
-- 
cgit 1.4.1