diff options
| author | Bart Schaefer <schaefer@zsh.org> | 2013-04-30 00:22:03 -0700 |
|---|---|---|
| committer | Bart Schaefer <schaefer@zsh.org> | 2013-04-30 00:22:03 -0700 |
| commit | 4e43360261e88346bd71b238f423cbf5bc8e1eff (patch) | |
| tree | a3aeed15b6187d854fd09282a733c23a43398b82 | |
| parent | f4b083327064c122945901736c19f381d3f67499 (diff) | |
| download | zsh-4e43360261e88346bd71b238f423cbf5bc8e1eff.tar.gz zsh-4e43360261e88346bd71b238f423cbf5bc8e1eff.tar.xz zsh-4e43360261e88346bd71b238f423cbf5bc8e1eff.zip | |
31361: handle negative optno ("no" prefix used)
when storing options with parseopts_insert() for sticky contexts
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/init.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 898aef16b..10c17d8b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ 2013-04-29 Bart Schaefer <schaefer@zsh.org> + * 31361: Src/init.c: handle negative optno ("no" prefix used) + when storing options with parseopts_insert() for sticky contexts + * 31353: Src/math.c: fix handling of floating point in ternary - + * 31350: Src/init.c, Src/input.c, Src/signals.h, Src/utils.c, Src/Zle/zle_main.c: block SIGWINCH nearly all the time, except when about to calculate prompts or do synchronous read, so diff --git a/Src/init.c b/Src/init.c index f4fb3bee4..01a969df4 100644 --- a/Src/init.c +++ b/Src/init.c @@ -281,9 +281,10 @@ parseargs(char **argv, char **runscript) /**/ static void -parseopts_insert(LinkList optlist, void *ptr) +parseopts_insert(LinkList optlist, void *base, int optno) { LinkNode node; + void *ptr = base + (optno < 0 ? -optno : optno); for (node = firstnode(optlist); node; incnode(node)) { if (ptr < getdata(node)) { @@ -390,7 +391,7 @@ parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp, if (dosetopt(optno, action, !nam, new_opts) && nam) { WARN_OPTION("can't change option: %s", *argv); } else if (optlist) { - parseopts_insert(optlist, new_opts+optno); + parseopts_insert(optlist, new_opts, optno); } } break; @@ -415,7 +416,7 @@ parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp, if (dosetopt(optno, action, !nam, new_opts) && nam) { WARN_OPTION("can't change option: -%c", **argv); } else if (optlist) { - parseopts_insert(optlist, new_opts+optno); + parseopts_insert(optlist, new_opts, optno); } } } |