diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2016-06-05 17:37:08 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-06-05 17:37:08 -0700 |
| commit | 8cca44482481eb4a91d2cae60f9c207a296a7d50 (patch) | |
| tree | 5ec00e1a92d25121c3aa083d34f30527609871da | |
| parent | cabacfff3b5485b1cee53674640dce29214cdd44 (diff) | |
| download | zsh-8cca44482481eb4a91d2cae60f9c207a296a7d50.tar.gz zsh-8cca44482481eb4a91d2cae60f9c207a296a7d50.tar.xz zsh-8cca44482481eb4a91d2cae60f9c207a296a7d50.zip | |
38622: consistent handling of "--" in "kill" builtin
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/jobs.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 24d46a482..d79ebc235 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ +2016-06-05 Barton E. Schaefer <schaefer@zsh.org> + + * 38622: Src/jobs.c: consistent handling of "--" in "kill" builtin + 2016-06-04 Eric Cook <llua@gmx.com> + * 38547: Completion/compdump: only autoload functions when they exist in fpath. diff --git a/Src/jobs.c b/Src/jobs.c index 2a9dbe7d6..04cb6b344 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -2527,6 +2527,10 @@ bin_kill(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func)) argv++; } + /* Discard the standard "-" and "--" option breaks */ + if (*argv && (*argv)[0] == '-' && (!(*argv)[1] || (*argv)[1] == '-')) + argv++; + if (!*argv) { zwarnnam(nam, "not enough arguments"); return 1; |