===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-detach-client.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/tmux/cmd-detach-client.c	2011/03/03 08:51:47	1.7
--- src/usr.bin/tmux/cmd-detach-client.c	2011/04/11 06:44:39	1.8
***************
*** 1,4 ****
! /* $OpenBSD: cmd-detach-client.c,v 1.7 2011/03/03 08:51:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-detach-client.c,v 1.8 2011/04/11 06:44:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 28,34 ****
  
  const struct cmd_entry cmd_detach_client_entry = {
  	"detach-client", "detach",
! 	"t:P", 0, 0,
  	"[-P] " CMD_TARGET_CLIENT_USAGE,
  	CMD_READONLY,
  	NULL,
--- 28,34 ----
  
  const struct cmd_entry cmd_detach_client_entry = {
  	"detach-client", "detach",
! 	"s:t:P", 0, 0,
  	"[-P] " CMD_TARGET_CLIENT_USAGE,
  	CMD_READONLY,
  	NULL,
***************
*** 41,54 ****
  {
  	struct args	*args = self->args;
  	struct client	*c;
  
- 	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
- 		return (-1);
- 
  	if (args_has(args, 'P'))
! 		server_write_client(c, MSG_DETACHKILL, NULL, 0);
  	else
! 		server_write_client(c, MSG_DETACH, NULL, 0);
  
  	return (0);
  }
--- 41,72 ----
  {
  	struct args	*args = self->args;
  	struct client	*c;
+ 	struct session 	*s;
+ 	enum msgtype     msgtype;
+ 	u_int 		 i;
  
  	if (args_has(args, 'P'))
! 		msgtype = MSG_DETACHKILL;
  	else
! 		msgtype = MSG_DETACH;
! 
! 	if (args_has(args, 's')) {
! 		s = cmd_find_session(ctx, args_get(args, 's'), 0);
! 		if (s == NULL)
! 			return (-1);
! 
! 		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
! 			c = ARRAY_ITEM(&clients, i);
! 			if (c != NULL && c->session == s)
! 				server_write_client(c, msgtype, NULL, 0);
! 		}
! 	} else {
! 		c = cmd_find_client(ctx, args_get(args, 't'));
! 		if (c == NULL)
! 			return (-1);
! 
! 		server_write_client(c, msgtype, NULL, 0);
! 	}
  
  	return (0);
  }