diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2016-04-26 10:40:56 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-04-26 10:40:56 -0700 |
| commit | 5ee05cf9353b36e2dbe4149717ec239d074d1f21 (patch) | |
| tree | bddae51e422b59dfb8e003b04fcea8cd5b1727ee | |
| parent | 442d702bbc33adafe75ed4ca4ad8b0404eb52584 (diff) | |
| download | zsh-5ee05cf9353b36e2dbe4149717ec239d074d1f21.tar.gz zsh-5ee05cf9353b36e2dbe4149717ec239d074d1f21.tar.xz zsh-5ee05cf9353b36e2dbe4149717ec239d074d1f21.zip | |
38350 (cf. Glenn Smith: 38348): Remove-all warning should warn about the root directory as well
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/exec.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 03eba5fcc..b8eba08f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-04-26 Barton E. Schaefer <schaefer@zsh.org> + + * 38350 (cf. Glenn Smith: 38348): Src/exec.c: Remove-all warning + should warn about the root directory as well + 2016-04-23 Daniel Shahaf <d.s@daniel.shahaf.name> * 38316: Completion/Unix/Command/_git: _git-rebase: Complete diff --git a/Src/exec.c b/Src/exec.c index 50eff72cb..2dcd5bcf5 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2902,11 +2902,11 @@ execcmd(Estate state, int input, int output, int how, int last1) if (s[0] == Star && !s[1]) { if (!checkrmall(pwd)) uremnode(args, node); - } else if (l > 2 && s[l - 2] == '/' && s[l - 1] == Star) { + } else if (l >= 2 && s[l - 2] == '/' && s[l - 1] == Star) { char t = s[l - 2]; s[l - 2] = 0; - if (!checkrmall(s)) + if (!checkrmall(*s ? s : "/")) uremnode(args, node); s[l - 2] = t; } |