===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-session.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-kill-session.c	2011/04/05 19:37:01	1.9
--- src/usr.bin/tmux/cmd-kill-session.c	2012/06/18 09:16:15	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-session.c,v 1.9 2011/04/05 19:37:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-kill-session.c,v 1.10 2012/06/18 09:16:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 31,38 ****
  
  const struct cmd_entry cmd_kill_session_entry = {
  	"kill-session", NULL,
! 	"t:", 0, 0,
! 	CMD_TARGET_SESSION_USAGE,
  	0,
  	NULL,
  	NULL,
--- 31,38 ----
  
  const struct cmd_entry cmd_kill_session_entry = {
  	"kill-session", NULL,
! 	"at:", 0, 0,
! 	"[-a] " CMD_TARGET_SESSION_USAGE,
  	0,
  	NULL,
  	NULL,
***************
*** 43,55 ****
  cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
! 	struct session	*s;
  
  	if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
  		return (-1);
  
! 	server_destroy_session(s);
! 	session_destroy(s);
! 
  	return (0);
  }
--- 43,63 ----
  cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
! 	struct session	*s, *s2, *s3;
  
  	if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
  		return (-1);
  
! 	if (args_has(args, 'a')) {
! 		RB_FOREACH_SAFE(s2, sessions, &sessions, s3) {
! 			if (s != s2) {
! 				server_destroy_session(s2);
! 				session_destroy(s2);
! 			}
! 		}
! 	} else {
! 		server_destroy_session(s);
! 		session_destroy(s);
! 	}
  	return (0);
  }