===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -c -r1.45 -r1.46
*** src/usr.bin/tmux/cmd-show-options.c	2019/04/05 20:32:31	1.45
--- src/usr.bin/tmux/cmd-show-options.c	2019/04/18 12:22:07	1.46
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-options.c,v 1.45 2019/04/05 20:32:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-show-options.c,v 1.46 2019/04/18 12:22:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 30,37 ****
  
  static enum cmd_retval	cmd_show_options_exec(struct cmd *, struct cmdq_item *);
  
! static enum cmd_retval	cmd_show_options_one(struct cmd *, struct cmdq_item *,
! 			    struct options *);
  static enum cmd_retval	cmd_show_options_all(struct cmd *, struct cmdq_item *,
  		    	    struct options *);
  
--- 30,37 ----
  
  static enum cmd_retval	cmd_show_options_exec(struct cmd *, struct cmdq_item *);
  
! static void		cmd_show_options_print(struct cmd *, struct cmdq_item *,
! 			    struct options_entry *, int);
  static enum cmd_retval	cmd_show_options_all(struct cmd *, struct cmdq_item *,
  		    	    struct options *);
  
***************
*** 66,88 ****
  {
  	struct args			*args = self->args;
  	struct cmd_find_state		*fs = &item->target;
  	struct options			*oo;
  	enum options_table_scope	 scope;
! 	char				*cause;
! 	int				 window;
  
  	window = (self->entry == &cmd_show_window_options_entry);
! 	scope = options_scope_from_flags(args, window, fs, &oo, &cause);
  	if (scope == OPTIONS_TABLE_NONE) {
  		cmdq_error(item, "%s", cause);
  		free(cause);
! 		return (CMD_RETURN_ERROR);
  	}
  
! 	if (args->argc == 0)
! 		return (cmd_show_options_all(self, item, oo));
! 	else
! 		return (cmd_show_options_one(self, item, oo));
  }
  
  static void
--- 66,160 ----
  {
  	struct args			*args = self->args;
  	struct cmd_find_state		*fs = &item->target;
+ 	struct client			*c = cmd_find_client(item, NULL, 1);
+ 	struct session			*s = item->target.s;
+ 	struct winlink			*wl = item->target.wl;
  	struct options			*oo;
  	enum options_table_scope	 scope;
! 	char				*argument, *name = NULL, *cause;
! 	const char			*target;
! 	int				 window, idx, ambiguous;
! 	struct options_entry		*o;
  
  	window = (self->entry == &cmd_show_window_options_entry);
! 	if (args->argc == 0) {
! 		scope = options_scope_from_flags(args, window, fs, &oo, &cause);
! 		return (cmd_show_options_all(self, item, oo));
! 	}
! 	argument = format_single(item, args->argv[0], c, s, wl, NULL);
! 
! 	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
! 			cmdq_error(item, "invalid option: %s", argument);
! 		goto fail;
! 	}
! 	if (*name == '@')
! 		scope = options_scope_from_flags(args, window, fs, &oo, &cause);
! 	else {
! 		if (options_get_only(global_options, name) != NULL)
! 			scope = OPTIONS_TABLE_SERVER;
! 		else if (options_get_only(global_s_options, name) != NULL)
! 			scope = OPTIONS_TABLE_SESSION;
! 		else if (options_get_only(global_w_options, name) != NULL)
! 			scope = OPTIONS_TABLE_WINDOW;
! 		else {
! 			scope = OPTIONS_TABLE_NONE;
! 			xasprintf(&cause, "unknown option: %s", argument);
! 		}
! 		if (scope == OPTIONS_TABLE_SERVER)
! 			oo = global_options;
! 		else if (scope == OPTIONS_TABLE_SESSION) {
! 			if (args_has(self->args, 'g'))
! 				oo = global_s_options;
! 			else if (s == NULL) {
! 				target = args_get(args, 't');
! 				if (target != NULL) {
! 					cmdq_error(item, "no such session: %s",
! 					    target);
! 				} else
! 					cmdq_error(item, "no current session");
! 				goto fail;
! 			} else
! 				oo = s->options;
! 		} else if (scope == OPTIONS_TABLE_WINDOW) {
! 			if (args_has(self->args, 'g'))
! 				oo = global_w_options;
! 			else if (wl == NULL) {
! 				target = args_get(args, 't');
! 				if (target != NULL) {
! 					cmdq_error(item, "no such window: %s",
! 					    target);
! 				} else
! 					cmdq_error(item, "no current window");
! 				goto fail;
! 			} else
! 				oo = wl->window->options;
! 		}
! 	}
  	if (scope == OPTIONS_TABLE_NONE) {
+ 		if (args_has(args, 'q'))
+ 			goto fail;
  		cmdq_error(item, "%s", cause);
  		free(cause);
! 		goto fail;
  	}
+ 	o = options_get_only(oo, name);
+ 	if (o != NULL)
+ 		cmd_show_options_print(self, item, o, idx);
  
! 	free(name);
! 	free(argument);
! 	return (CMD_RETURN_NORMAL);
! 
! fail:
! 	free(name);
! 	free(argument);
! 	return (CMD_RETURN_ERROR);
  }
  
  static void
***************
*** 121,164 ****
  		cmdq_print(item, "%s %s", name, value);
  
  	free(tmp);
- }
- 
- static enum cmd_retval
- cmd_show_options_one(struct cmd *self, struct cmdq_item *item,
-     struct options *oo)
- {
- 	struct args		*args = self->args;
- 	struct client		*c = cmd_find_client(item, NULL, 1);
- 	struct session		*s = item->target.s;
- 	struct winlink		*wl = item->target.wl;
- 	struct options_entry	*o;
- 	int			 idx, ambiguous;
- 	char			*name;
- 
- 	name = format_single(item, args->argv[0], c, s, wl, NULL);
- 	o = options_match_get(oo, name, &idx, 1, &ambiguous);
- 	if (o == NULL) {
- 		if (args_has(args, 'q')) {
- 			free(name);
- 			return (CMD_RETURN_NORMAL);
- 		}
- 		if (ambiguous) {
- 			cmdq_error(item, "ambiguous option: %s", name);
- 			free(name);
- 			return (CMD_RETURN_ERROR);
- 		}
- 		if (*name != '@' &&
- 		    options_match_get(oo, name, &idx, 0, &ambiguous) != NULL) {
- 			free(name);
- 			return (CMD_RETURN_NORMAL);
- 		}
- 		cmdq_error(item, "unknown option: %s", name);
- 		free(name);
- 		return (CMD_RETURN_ERROR);
- 	}
- 	cmd_show_options_print(self, item, o, idx);
- 	free(name);
- 	return (CMD_RETURN_NORMAL);
  }
  
  static enum cmd_retval
--- 193,198 ----