diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2013-03-19 15:05:35 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2013-03-19 15:05:35 +0000 |
| commit | 0c226a628297057e2ef5a8e06755e1c37b260304 (patch) | |
| tree | f793c9142bc5e269ee8ee3d54731137920718913 | |
| parent | 146374a2af8cbc7674374b44ef6c963ee008e8a2 (diff) | |
| download | zsh-0c226a628297057e2ef5a8e06755e1c37b260304.tar.gz zsh-0c226a628297057e2ef5a8e06755e1c37b260304.tar.xz zsh-0c226a628297057e2ef5a8e06755e1c37b260304.zip | |
31158: following a wildcard with a repetition produces a bad pattern error
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Src/pattern.c | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 7ebe0aed9..ef31e4648 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,16 @@ +2013-03-19 Bart Schaefer <schaefer@zsh.org> + + * 31158: Src/pattern.c: following a wildcard with a repetition + produces a bad pattern error instead of an unbounded search + 2013-03-17 Peter Stephenson <p.w.stephenson@ntlworld.com> - * 31156: improved math context completion: functions. + * 31156: Completion/Zsh/Context/_math, + Completion/Zsh/Context/_zcalc_line, Completion/Zsh/Type/.distfile, + Completion/Zsh/Type/_math_params, + Completion/Zsh/Type/_module_math_func, + Completion/Zsh/Type/_user_math_func: improved math context + completion: functions. * 31155: Doc/Zsh/contrib.yo, Functions/Misc/zcalc: minor extra zcalc features and documentation. @@ -615,5 +625,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5824 $ +* $Revision: 1.5825 $ ***************************************************** diff --git a/Src/pattern.c b/Src/pattern.c index 53ada0f8d..3b6edb850 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -1474,7 +1474,7 @@ patcomppiece(int *flagp) } /* too much at once doesn't currently work */ - if (kshchar && pound) + if (kshchar && (pound || count)) return 0; if (kshchar == '*') { |