===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-lock-server.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/tmux/cmd-lock-server.c	2015/11/18 14:27:44	1.18
--- src/usr.bin/tmux/cmd-lock-server.c	2015/12/13 14:32:38	1.19
***************
*** 1,4 ****
! /* $OpenBSD: cmd-lock-server.c,v 1.18 2015/11/18 14:27:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-lock-server.c,v 1.19 2015/12/13 14:32:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 38,44 ****
  	"lock-session", "locks",
  	"t:", 0, 0,
  	CMD_TARGET_SESSION_USAGE,
! 	0,
  	cmd_lock_server_exec
  };
  
--- 38,44 ----
  	"lock-session", "locks",
  	"t:", 0, 0,
  	CMD_TARGET_SESSION_USAGE,
! 	CMD_SESSION_T,
  	cmd_lock_server_exec
  };
  
***************
*** 46,75 ****
  	"lock-client", "lockc",
  	"t:", 0, 0,
  	CMD_TARGET_CLIENT_USAGE,
! 	0,
  	cmd_lock_server_exec
  };
  
  enum cmd_retval
  cmd_lock_server_exec(struct cmd *self, __unused struct cmd_q *cmdq)
  {
- 	struct args	*args = self->args;
- 	struct client	*c;
- 	struct session	*s;
- 
  	if (self->entry == &cmd_lock_server_entry)
  		server_lock();
! 	else if (self->entry == &cmd_lock_session_entry) {
! 		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
! 		if (s == NULL)
! 			return (CMD_RETURN_ERROR);
! 		server_lock_session(s);
! 	} else {
! 		c = cmd_find_client(cmdq, args_get(args, 't'), 0);
! 		if (c == NULL)
! 			return (CMD_RETURN_ERROR);
! 		server_lock_client(c);
! 	}
  	recalculate_sizes();
  
  	return (CMD_RETURN_NORMAL);
--- 46,65 ----
  	"lock-client", "lockc",
  	"t:", 0, 0,
  	CMD_TARGET_CLIENT_USAGE,
! 	CMD_CLIENT_T,
  	cmd_lock_server_exec
  };
  
  enum cmd_retval
  cmd_lock_server_exec(struct cmd *self, __unused struct cmd_q *cmdq)
  {
  	if (self->entry == &cmd_lock_server_entry)
  		server_lock();
! 	else if (self->entry == &cmd_lock_session_entry)
! 		server_lock_session(cmdq->state.tflag.s);
! 	else
! 		server_lock_client(cmdq->state.c);
! 
  	recalculate_sizes();
  
  	return (CMD_RETURN_NORMAL);