diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2016-01-01 13:01:16 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-01-01 13:01:16 -0800 |
| commit | 5c17f9ab3f7c873f8a04498af8d77d5f3ca8e3e0 (patch) | |
| tree | 1bb5edd57f215e4d1a8e4fb0a93eef91646e962b | |
| parent | 62706b1abc6842cd63ad66ae7142bb16e26c4bcc (diff) | |
| download | zsh-5c17f9ab3f7c873f8a04498af8d77d5f3ca8e3e0.tar.gz zsh-5c17f9ab3f7c873f8a04498af8d77d5f3ca8e3e0.tar.xz zsh-5c17f9ab3f7c873f8a04498af8d77d5f3ca8e3e0.zip | |
37473: check for cshnullglob in command position.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/exec.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 53274e37e..1bb72c837 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-01-01 Barton E. Schaefer <schaefer@zsh.org> + + * 37473: Src/exec.c: check for cshnullglob in command position. + 2015-12-31 Barton E. Schaefer <schaefer@zsh.org> * 37469: Src/parse.c: do NOT allow semicolons in place of line breaks diff --git a/Src/exec.c b/Src/exec.c index 18d19b672..352615c83 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2785,6 +2785,11 @@ execcmd(Estate state, int input, int output, int how, int last1) * arguments before and no command substitution * has provided a status. */ + if (badcshglob == 1) { + zerr("no match"); + lastval = 1; + return; + } cmdoutval = use_cmdoutval ? lastval : 0; if (varspc) addvars(state, varspc, 0); |