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 | |
| 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/utils.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 72b1ebaad..388d052c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-04-15 Barton E. Schaefer <schaefer@zsh.org> + + * 42636: Src/utils.c: fix GLOB_DOTS for !(RM_STAR_SILENT) + 2018-04-13 Daniel Hahler <zsh@thequod.de> * 42631: Completion/Unix/Command/_pgrep: _pgrep: pkill: fix completion @@ -206,7 +210,7 @@ * 42487: Src/Zle/compctl.c: remove gcc 7.3.0 warnings and potentially incorrect pointer usage. -2018-03-18 Barton E. Schaefer <schaefer@brasslantern.com> +2018-03-18 Barton E. Schaefer <schaefer@zsh.org> * Stephane: 42469: Src/exec.c, Src/Modules/mapfile.c: fix 42465 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; |