Do not return error with -q, GitHub issue 3065.

diff --git a/usr.bin/tmux/cmd-show-options.c b/usr.bin/tmux/cmd-show-options.c
index f5c981c..2591a8d 100644 (file)
--- a/usr.bin/tmux/cmd-show-options.c
+++ b/usr.bin/tmux/cmd-show-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-show-options.c,v 1.68 2021/10/21 08:23:48 nicm Exp $ */
+/* $OpenBSD: cmd-show-options.c,v 1.69 2022/02/14 09:10:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -103,7 +103,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
        name = options_match(argument, &idx, &ambiguous);
        if (name == NULL) {
                if (args_has(args, 'q'))
-                       goto fail;
+                       goto out;
                if (ambiguous)
                        cmdq_error(item, "ambiguous option: %s", argument);
                else
@@ -114,7 +114,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
            &cause);
        if (scope == OPTIONS_TABLE_NONE) {
                if (args_has(args, 'q'))
-                       goto fail;
+                       goto out;
                cmdq_error(item, "%s", cause);
                free(cause);
                goto fail;
@@ -129,11 +129,12 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
                cmd_show_options_print(self, item, o, idx, parent);
        else if (*name == '@') {
                if (args_has(args, 'q'))
-                       goto fail;
+                       goto out;
                cmdq_error(item, "invalid option: %s", argument);
                goto fail;
        }
 
+out:
        free(name);
        free(argument);
        return (CMD_RETURN_NORMAL);