===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-detach-client.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/tmux/cmd-detach-client.c	2020/04/13 10:59:58	1.34
--- src/usr.bin/tmux/cmd-detach-client.c	2020/04/13 20:51:57	1.35
***************
*** 1,4 ****
! /* $OpenBSD: cmd-detach-client.c,v 1.34 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-detach-client.c,v 1.35 2020/04/13 20:51:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 39,45 ****
  
  	.source = { 's', CMD_FIND_SESSION, CMD_FIND_CANFAIL },
  
! 	.flags = CMD_READONLY,
  	.exec = cmd_detach_client_exec
  };
  
--- 39,45 ----
  
  	.source = { 's', CMD_FIND_SESSION, CMD_FIND_CANFAIL },
  
! 	.flags = CMD_READONLY|CMD_CLIENT_TFLAG,
  	.exec = cmd_detach_client_exec
  };
  
***************
*** 50,56 ****
  	.args = { "t:", 0, 0 },
  	.usage = CMD_TARGET_CLIENT_USAGE,
  
! 	.flags = 0,
  	.exec = cmd_detach_client_exec
  };
  
--- 50,56 ----
  	.args = { "t:", 0, 0 },
  	.usage = CMD_TARGET_CLIENT_USAGE,
  
! 	.flags = CMD_CLIENT_TFLAG,
  	.exec = cmd_detach_client_exec
  };
  
***************
*** 59,74 ****
  {
  	struct args		*args = cmd_get_args(self);
  	struct cmd_find_state	*source = cmdq_get_source(item);
! 	struct client		*c, *cloop;
  	struct session		*s;
  	enum msgtype		 msgtype;
  	const char		*cmd = args_get(args, 'E');
  
- 	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
- 		return (CMD_RETURN_ERROR);
- 
  	if (cmd_get_entry(self) == &cmd_suspend_client_entry) {
! 		server_client_suspend(c);
  		return (CMD_RETURN_NORMAL);
  	}
  
--- 59,71 ----
  {
  	struct args		*args = cmd_get_args(self);
  	struct cmd_find_state	*source = cmdq_get_source(item);
! 	struct client		*tc = cmdq_get_target_client(item), *loop;
  	struct session		*s;
  	enum msgtype		 msgtype;
  	const char		*cmd = args_get(args, 'E');
  
  	if (cmd_get_entry(self) == &cmd_suspend_client_entry) {
! 		server_client_suspend(tc);
  		return (CMD_RETURN_NORMAL);
  	}
  
***************
*** 81,112 ****
  		s = source->s;
  		if (s == NULL)
  			return (CMD_RETURN_NORMAL);
! 		TAILQ_FOREACH(cloop, &clients, entry) {
! 			if (cloop->session == s) {
  				if (cmd != NULL)
! 					server_client_exec(cloop, cmd);
  				else
! 					server_client_detach(cloop, msgtype);
  			}
  		}
  		return (CMD_RETURN_STOP);
  	}
  
  	if (args_has(args, 'a')) {
! 		TAILQ_FOREACH(cloop, &clients, entry) {
! 			if (cloop->session != NULL && cloop != c) {
  				if (cmd != NULL)
! 					server_client_exec(cloop, cmd);
  				else
! 					server_client_detach(cloop, msgtype);
  			}
  		}
  		return (CMD_RETURN_NORMAL);
  	}
  
  	if (cmd != NULL)
! 		server_client_exec(c, cmd);
  	else
! 		server_client_detach(c, msgtype);
  	return (CMD_RETURN_STOP);
  }
--- 78,109 ----
  		s = source->s;
  		if (s == NULL)
  			return (CMD_RETURN_NORMAL);
! 		TAILQ_FOREACH(loop, &clients, entry) {
! 			if (loop->session == s) {
  				if (cmd != NULL)
! 					server_client_exec(loop, cmd);
  				else
! 					server_client_detach(loop, msgtype);
  			}
  		}
  		return (CMD_RETURN_STOP);
  	}
  
  	if (args_has(args, 'a')) {
! 		TAILQ_FOREACH(loop, &clients, entry) {
! 			if (loop->session != NULL && loop != tc) {
  				if (cmd != NULL)
! 					server_client_exec(loop, cmd);
  				else
! 					server_client_detach(loop, msgtype);
  			}
  		}
  		return (CMD_RETURN_NORMAL);
  	}
  
  	if (cmd != NULL)
! 		server_client_exec(tc, cmd);
  	else
! 		server_client_detach(tc, msgtype);
  	return (CMD_RETURN_STOP);
  }