diff options
| author | nicm <nicm> | 2019-04-30 18:02:03 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2019-04-30 18:02:03 +0000 |
| commit | 429c4bc51b2c03e400802c9d224e4f7cc6113194 (patch) | |
| tree | 5c8156675300ff427a42acf85a2f6a57a93e0594 /cmd-show-options.c | |
| parent | 5a288b1efe9b5b6cb521a2b0861e6deb2252cb3c (diff) | |
Fix user options after show-hooks merge, GitHub issue 1704.
Diffstat (limited to 'cmd-show-options.c')
| -rw-r--r-- | cmd-show-options.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmd-show-options.c b/cmd-show-options.c index e19a634a..80e9cd42 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -216,19 +216,21 @@ static enum cmd_retval cmd_show_options_all(struct cmd *self, struct cmdq_item *item, struct options *oo) { - struct options_entry *o; - struct options_array_item *a; - u_int idx; - int flags; + struct options_entry *o; + struct options_array_item *a; + u_int idx; + const struct options_table_entry *oe; o = options_first(oo); while (o != NULL) { - flags = options_table_entry(o)->flags; + oe = options_table_entry(o); if ((self->entry != &cmd_show_hooks_entry && !args_has(self->args, 'H') && - (flags & OPTIONS_TABLE_IS_HOOK)) || + oe != NULL && + (oe->flags & OPTIONS_TABLE_IS_HOOK)) || (self->entry == &cmd_show_hooks_entry && - (~flags & OPTIONS_TABLE_IS_HOOK))) { + (oe == NULL || + (~oe->flags & OPTIONS_TABLE_IS_HOOK)))) { o = options_next(o); continue; } |