diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2018-04-15 10:56:35 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2018-04-15 10:57:27 -0700 |
| commit | 517cda383217ae4c68c5782429a5dbc4962b407a (patch) | |
| tree | 98a3f7711e6a2e70af925398324e29e8f4630802 /Src/utils.c | |
| parent | 5bd659352fff6d8d7d2b70af28fea756f6d84582 (diff) | |
| download | zsh-517cda383217ae4c68c5782429a5dbc4962b407a.tar.gz zsh-517cda383217ae4c68c5782429a5dbc4962b407a.tar.xz zsh-517cda383217ae4c68c5782429a5dbc4962b407a.zip | |
42636: fix GLOB_DOTS for !(RM_STAR_SILENT)
Also fix paste-o in older log entry
Diffstat (limited to 'Src/utils.c')
| -rw-r--r-- | Src/utils.c | 9 |
1 files changed, 5 insertions, 4 deletions
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; |