===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-detach-client.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-detach-client.c	2011/04/11 16:44:36	1.9
--- src/usr.bin/tmux/cmd-detach-client.c	2012/06/18 09:15:22	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-detach-client.c,v 1.9 2011/04/11 16:44:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-detach-client.c,v 1.10 2012/06/18 09:15:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 28,35 ****
  
  const struct cmd_entry cmd_detach_client_entry = {
  	"detach-client", "detach",
! 	"s:t:P", 0, 0,
! 	"[-P] [-s target-session] " CMD_TARGET_CLIENT_USAGE,
  	CMD_READONLY,
  	NULL,
  	NULL,
--- 28,35 ----
  
  const struct cmd_entry cmd_detach_client_entry = {
  	"detach-client", "detach",
! 	"as:t:P", 0, 0,
! 	"[-P] [-a] [-s target-session] " CMD_TARGET_CLIENT_USAGE,
  	CMD_READONLY,
  	NULL,
  	NULL,
***************
*** 40,46 ****
  cmd_detach_client_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
! 	struct client	*c;
  	struct session 	*s;
  	enum msgtype     msgtype;
  	u_int 		 i;
--- 40,46 ----
  cmd_detach_client_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
! 	struct client	*c, *c2;
  	struct session 	*s;
  	enum msgtype     msgtype;
  	u_int 		 i;
***************
*** 65,71 ****
  		if (c == NULL)
  			return (-1);
  
! 		server_write_client(c, msgtype, NULL, 0);
  	}
  
  	return (0);
--- 65,79 ----
  		if (c == NULL)
  			return (-1);
  
! 		if (args_has(args, 'a')) {
! 			for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
! 				c2 = ARRAY_ITEM(&clients, i);
! 				if (c2 == NULL || c == c2)
! 					continue;
! 				server_write_client(c2, msgtype, NULL, 0);
! 			}
! 		} else
! 			server_write_client(c, msgtype, NULL, 0);
  	}
  
  	return (0);