===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.386
retrieving revision 1.387
diff -c -r1.386 -r1.387
*** src/usr.bin/tmux/tmux.h	2013/03/22 10:38:13	1.386
--- src/usr.bin/tmux/tmux.h	2013/03/22 15:49:55	1.387
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.386 2013/03/22 10:38:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.387 2013/03/22 15:49:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1366,1374 ****
  	 * cmdclient and curclient may both be NULL if the command is in the
  	 * configuration file.
  	 */
! 	struct client  *curclient;
! 	struct client  *cmdclient;
  
  	struct msg_command_data	*msgdata;
  
  	/* gcc2 doesn't understand attributes on function pointers... */
--- 1366,1376 ----
  	 * cmdclient and curclient may both be NULL if the command is in the
  	 * configuration file.
  	 */
! 	struct client		*curclient;
! 	struct client		*cmdclient;
  
+ 	int			 references;
+ 
  	struct msg_command_data	*msgdata;
  
  	/* gcc2 doesn't understand attributes on function pointers... */
***************
*** 1714,1726 ****
  		    struct args *, u_char, long long, long long, char **);
  
  /* cmd.c */
  int		 cmd_pack_argv(int, char **, char *, size_t);
  int		 cmd_unpack_argv(char *, size_t, int, char ***);
  char	       **cmd_copy_argv(int, char *const *);
  void		 cmd_free_argv(int, char **);
  struct cmd	*cmd_parse(int, char **, char **);
- enum cmd_retval	 cmd_exec(struct cmd *, struct cmd_ctx *);
- void		 cmd_free(struct cmd *);
  size_t		 cmd_print(struct cmd *, char *, size_t);
  struct session	*cmd_current_session(struct cmd_ctx *, int);
  struct client	*cmd_current_client(struct cmd_ctx *);
--- 1716,1729 ----
  		    struct args *, u_char, long long, long long, char **);
  
  /* cmd.c */
+ struct cmd_ctx	*cmd_get_ctx(void);
+ void		 cmd_free_ctx(struct cmd_ctx *);
+ void		 cmd_ref_ctx(struct cmd_ctx *);
  int		 cmd_pack_argv(int, char **, char *, size_t);
  int		 cmd_unpack_argv(char *, size_t, int, char ***);
  char	       **cmd_copy_argv(int, char *const *);
  void		 cmd_free_argv(int, char **);
  struct cmd	*cmd_parse(int, char **, char **);
  size_t		 cmd_print(struct cmd *, char *, size_t);
  struct session	*cmd_current_session(struct cmd_ctx *, int);
  struct client	*cmd_current_client(struct cmd_ctx *);