===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-environment.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/tmux/cmd-set-environment.c	2009/08/11 12:53:37	1.2
--- src/usr.bin/tmux/cmd-set-environment.c	2009/11/13 19:53:29	1.3
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-environment.c,v 1.2 2009/08/11 12:53:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-environment.c,v 1.3 2009/11/13 19:53:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 32,38 ****
  const struct cmd_entry cmd_set_environment_entry = {
  	"set-environment", "setenv",
  	"[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
! 	CMD_ARG12, CMD_CHFLAG('g')|CMD_CHFLAG('r')|CMD_CHFLAG('u'),
  	NULL,
  	cmd_target_parse,
  	cmd_set_environment_exec,
--- 32,38 ----
  const struct cmd_entry cmd_set_environment_entry = {
  	"set-environment", "setenv",
  	"[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
! 	CMD_ARG12, "gru",
  	NULL,
  	cmd_target_parse,
  	cmd_set_environment_exec,
***************
*** 56,62 ****
  		return (-1);
  	}
  
! 	if (data->chflags & CMD_CHFLAG('g'))
  		env = &global_environ;
  	else {
  		if ((s = cmd_find_session(ctx, data->target)) == NULL)
--- 56,62 ----
  		return (-1);
  	}
  
! 	if (cmd_check_flag(data->chflags, 'g'))
  		env = &global_environ;
  	else {
  		if ((s = cmd_find_session(ctx, data->target)) == NULL)
***************
*** 64,76 ****
  		env = &s->environ;
  	}
  
! 	if (data->chflags & CMD_CHFLAG('u')) {
  		if (data->arg2 != NULL) {
  			ctx->error(ctx, "can't specify a value with -u");
  			return (-1);
  		}
  		environ_unset(env, data->arg);
! 	} else if (data->chflags & CMD_CHFLAG('r')) {
  		if (data->arg2 != NULL) {
  			ctx->error(ctx, "can't specify a value with -r");
  			return (-1);
--- 64,76 ----
  		env = &s->environ;
  	}
  
! 	if (cmd_check_flag(data->chflags, 'u')) {
  		if (data->arg2 != NULL) {
  			ctx->error(ctx, "can't specify a value with -u");
  			return (-1);
  		}
  		environ_unset(env, data->arg);
! 	} else if (cmd_check_flag(data->chflags, 'r')) {
  		if (data->arg2 != NULL) {
  			ctx->error(ctx, "can't specify a value with -r");
  			return (-1);