===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-rename-session.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/cmd-rename-session.c	2012/07/11 07:10:15	1.13
--- src/usr.bin/tmux/cmd-rename-session.c	2013/03/24 09:54:10	1.14
***************
*** 1,4 ****
! /* $OpenBSD: cmd-rename-session.c,v 1.13 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-rename-session.c,v 1.14 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 26,32 ****
   * Change session name.
   */
  
! enum cmd_retval	 cmd_rename_session_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_rename_session_entry = {
  	"rename-session", "rename",
--- 26,32 ----
   * Change session name.
   */
  
! enum cmd_retval	 cmd_rename_session_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_rename_session_entry = {
  	"rename-session", "rename",
***************
*** 39,45 ****
  };
  
  enum cmd_retval
! cmd_rename_session_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
  	struct session	*s;
--- 39,45 ----
  };
  
  enum cmd_retval
! cmd_rename_session_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	struct session	*s;
***************
*** 47,61 ****
  
  	newname = args->argv[0];
  	if (!session_check_name(newname)) {
! 		ctx->error(ctx, "bad session name: %s", newname);
  		return (CMD_RETURN_ERROR);
  	}
  	if (session_find(newname) != NULL) {
! 		ctx->error(ctx, "duplicate session: %s", newname);
  		return (CMD_RETURN_ERROR);
  	}
  
! 	if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	RB_REMOVE(sessions, &sessions, s);
--- 47,61 ----
  
  	newname = args->argv[0];
  	if (!session_check_name(newname)) {
! 		cmdq_error(cmdq, "bad session name: %s", newname);
  		return (CMD_RETURN_ERROR);
  	}
  	if (session_find(newname) != NULL) {
! 		cmdq_error(cmdq, "duplicate session: %s", newname);
  		return (CMD_RETURN_ERROR);
  	}
  
! 	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	RB_REMOVE(sessions, &sessions, s);