===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-environment.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/tmux/cmd-set-environment.c	2020/04/13 08:26:27	1.24
--- src/usr.bin/tmux/cmd-set-environment.c	2020/04/13 10:59:58	1.25
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-environment.c,v 1.24 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-set-environment.c,v 1.25 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 46,54 ****
  static enum cmd_retval
  cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args	*args = cmd_get_args(self);
! 	struct environ	*env;
! 	const char	*name, *value, *target;
  
  	name = args->argv[0];
  	if (*name == '\0') {
--- 46,55 ----
  static enum cmd_retval
  cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = cmd_get_args(self);
! 	struct cmd_find_state	*target = cmdq_get_target(item);
! 	struct environ		*env;
! 	const char		*name, *value, *tflag;
  
  	name = args->argv[0];
  	if (*name == '\0') {
***************
*** 68,82 ****
  	if (args_has(args, 'g'))
  		env = global_environ;
  	else {
! 		if (item->target.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");
  			return (CMD_RETURN_ERROR);
  		}
! 		env = item->target.s->environ;
  	}
  
  	if (args_has(args, 'u')) {
--- 69,83 ----
  	if (args_has(args, 'g'))
  		env = global_environ;
  	else {
! 		if (target->s == NULL) {
! 			tflag = args_get(args, 't');
! 			if (tflag != NULL)
! 				cmdq_error(item, "no such session: %s", tflag);
  			else
  				cmdq_error(item, "no current session");
  			return (CMD_RETURN_ERROR);
  		}
! 		env = target->s->environ;
  	}
  
  	if (args_has(args, 'u')) {