mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

32600: in _arguments, "-" is not an option letter after another "-"

Browse source
This commit is contained in:
m0viefreak 2014-05-08 14:45:41 +02:00 committed by Peter Stephenson
parent 6a201af341
commit f5fe52c495
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2014-05-08 Peter Stephenson <p.stephenson@samsung.com>
* m0viefreak: 32600: Src/Zle/computil.c: fix problem with
_arguments thinking -- is a single letter option called '-',
which it isn't.
2014-05-06 Daniel Shahaf <d.s@daniel.shahaf.name> 2014-05-06 Daniel Shahaf <d.s@daniel.shahaf.name>
* 32597: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: * 32597: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:

10
Src/Zle/computil.c
View file

@ -1500,9 +1500,11 @@ parse_cadef(char *nam, char **args)
nodopts++; nodopts++;
/* If this is for single-letter option we also store a /* If this is for single-letter option we also store a
* pointer for the definition in the array for fast lookup. */ * pointer for the definition in the array for fast lookup.
* But don't treat '--' as a single option called '-' */
if (single && name[1] && !name[2])
if (single && name[1] && !name[2] && name[1] != '-')
ret->single[STOUC(name[1])] = opt; ret->single[STOUC(name[1])] = opt;
if (again == 1) { if (again == 1) {
@ -2034,7 +2036,9 @@ ca_parse_line(Cadef d, int multi, int first)
state.optbeg = state.argbeg = state.inopt = cur; state.optbeg = state.argbeg = state.inopt = cur;
state.argend = argend; state.argend = argend;
state.singles = (d->single && (!pe || !*pe) && state.singles = (d->single && (!pe || !*pe) &&
state.curopt->name[1] && !state.curopt->name[2]); state.curopt->name[1] && !state.curopt->name[2] &&
/* Don't treat '--' as a single option called '-' */
state.curopt->name[1] != '-');
if (!state.oargs[state.curopt->num]) if (!state.oargs[state.curopt->num])
state.oargs[state.curopt->num] = znewlinklist(); state.oargs[state.curopt->num] = znewlinklist();