===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/tmux/cmd-queue.c	2014/10/27 22:23:47	1.20
--- src/usr.bin/tmux/cmd-queue.c	2015/02/05 10:26:29	1.21
***************
*** 1,4 ****
! /* $OpenBSD: cmd-queue.c,v 1.20 2014/10/27 22:23:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-queue.c,v 1.21 2015/02/05 10:26:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 117,136 ****
  }
  
  /* Print a guard line. */
! int
  cmdq_guard(struct cmd_q *cmdq, const char *guard, int flags)
  {
  	struct client	*c = cmdq->client;
  
! 	if (c == NULL)
! 		return (0);
! 	if (!(c->flags & CLIENT_CONTROL))
! 		return (0);
  
  	evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard,
  	    (long) cmdq->time, cmdq->number, flags);
  	server_push_stdout(c);
- 	return (1);
  }
  
  /* Add command list to queue and begin processing if needed. */
--- 117,133 ----
  }
  
  /* Print a guard line. */
! void
  cmdq_guard(struct cmd_q *cmdq, const char *guard, int flags)
  {
  	struct client	*c = cmdq->client;
  
! 	if (c == NULL || !(c->flags & CLIENT_CONTROL))
! 		return;
  
  	evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard,
  	    (long) cmdq->time, cmdq->number, flags);
  	server_push_stdout(c);
  }
  
  /* Add command list to queue and begin processing if needed. */
***************
*** 163,169 ****
  {
  	struct cmd_q_item	*next;
  	enum cmd_retval		 retval;
! 	int			 empty, guard, flags;
  	char			 s[1024];
  
  	notify_disable();
--- 160,166 ----
  {
  	struct cmd_q_item	*next;
  	enum cmd_retval		 retval;
! 	int			 empty, flags;
  	char			 s[1024];
  
  	notify_disable();
***************
*** 188,203 ****
  			cmdq->number++;
  
  			flags = !!(cmdq->cmd->flags & CMD_CONTROL);
! 			guard = cmdq_guard(cmdq, "begin", flags);
  
  			retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
  
! 			if (guard) {
! 				if (retval == CMD_RETURN_ERROR)
! 					cmdq_guard(cmdq, "error", flags);
! 				else
! 					cmdq_guard(cmdq, "end", flags);
! 			}
  
  			if (retval == CMD_RETURN_ERROR)
  				break;
--- 185,198 ----
  			cmdq->number++;
  
  			flags = !!(cmdq->cmd->flags & CMD_CONTROL);
! 			cmdq_guard(cmdq, "begin", flags);
  
  			retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
  
! 			if (retval == CMD_RETURN_ERROR)
! 				cmdq_guard(cmdq, "error", flags);
! 			else
! 				cmdq_guard(cmdq, "end", flags);
  
  			if (retval == CMD_RETURN_ERROR)
  				break;