===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-environment.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/tmux/cmd-show-environment.c	2020/03/31 17:14:40	1.24
--- src/usr.bin/tmux/cmd-show-environment.c	2020/04/13 08:26:27	1.25
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-environment.c,v 1.24 2020/03/31 17:14:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-show-environment.c,v 1.25 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 69,75 ****
  cmd_show_environment_print(struct cmd *self, struct cmdq_item *item,
      struct environ_entry *envent)
  {
! 	struct args	*args = self->args;
  	char		*escaped;
  
  	if (!args_has(args, 'h') && (envent->flags & ENVIRON_HIDDEN))
--- 69,75 ----
  cmd_show_environment_print(struct cmd *self, struct cmdq_item *item,
      struct environ_entry *envent)
  {
! 	struct args	*args = cmd_get_args(self);
  	char		*escaped;
  
  	if (!args_has(args, 'h') && (envent->flags & ENVIRON_HIDDEN))
***************
*** 77,83 ****
  	if (args_has(args, 'h') && (~envent->flags & ENVIRON_HIDDEN))
  		return;
  
! 	if (!args_has(self->args, 's')) {
  		if (envent->value != NULL)
  			cmdq_print(item, "%s=%s", envent->name, envent->value);
  		else
--- 77,83 ----
  	if (args_has(args, 'h') && (~envent->flags & ENVIRON_HIDDEN))
  		return;
  
! 	if (!args_has(args, 's')) {
  		if (envent->value != NULL)
  			cmdq_print(item, "%s=%s", envent->name, envent->value);
  		else
***************
*** 97,103 ****
  static enum cmd_retval
  cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = self->args;
  	struct environ		*env;
  	struct environ_entry	*envent;
  	const char		*target;
--- 97,103 ----
  static enum cmd_retval
  cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = cmd_get_args(self);
  	struct environ		*env;
  	struct environ_entry	*envent;
  	const char		*target;
***************
*** 109,115 ****
  		}
  	}
  
! 	if (args_has(self->args, 'g'))
  		env = global_environ;
  	else {
  		if (item->target.s == NULL) {
--- 109,115 ----
  		}
  	}
  
! 	if (args_has(args, 'g'))
  		env = global_environ;
  	else {
  		if (item->target.s == NULL) {