===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -c -r1.68 -r1.69
*** src/usr.bin/tmux/cmd-show-options.c	2021/10/21 08:23:48	1.68
--- src/usr.bin/tmux/cmd-show-options.c	2022/02/14 09:10:48	1.69
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-options.c,v 1.68 2021/10/21 08:23:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $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,109 ****
  	name = options_match(argument, &idx, &ambiguous);
  	if (name == NULL) {
  		if (args_has(args, 'q'))
! 			goto fail;
  		if (ambiguous)
  			cmdq_error(item, "ambiguous option: %s", argument);
  		else
--- 103,109 ----
  	name = options_match(argument, &idx, &ambiguous);
  	if (name == NULL) {
  		if (args_has(args, 'q'))
! 			goto out;
  		if (ambiguous)
  			cmdq_error(item, "ambiguous option: %s", argument);
  		else
***************
*** 114,120 ****
  	    &cause);
  	if (scope == OPTIONS_TABLE_NONE) {
  		if (args_has(args, 'q'))
! 			goto fail;
  		cmdq_error(item, "%s", cause);
  		free(cause);
  		goto fail;
--- 114,120 ----
  	    &cause);
  	if (scope == OPTIONS_TABLE_NONE) {
  		if (args_has(args, 'q'))
! 			goto out;
  		cmdq_error(item, "%s", cause);
  		free(cause);
  		goto fail;
***************
*** 129,139 ****
  		cmd_show_options_print(self, item, o, idx, parent);
  	else if (*name == '@') {
  		if (args_has(args, 'q'))
! 			goto fail;
  		cmdq_error(item, "invalid option: %s", argument);
  		goto fail;
  	}
  
  	free(name);
  	free(argument);
  	return (CMD_RETURN_NORMAL);
--- 129,140 ----
  		cmd_show_options_print(self, item, o, idx, parent);
  	else if (*name == '@') {
  		if (args_has(args, 'q'))
! 			goto out;
  		cmdq_error(item, "invalid option: %s", argument);
  		goto fail;
  	}
  
+ out:
  	free(name);
  	free(argument);
  	return (CMD_RETURN_NORMAL);