From 4e43360261e88346bd71b238f423cbf5bc8e1eff Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Tue, 30 Apr 2013 00:22:03 -0700 Subject: 31361: handle negative optno ("no" prefix used) when storing options with parseopts_insert() for sticky contexts --- Src/init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Src') 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); } } } -- cgit 1.4.1