===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.462
retrieving revision 1.463
diff -c -r1.462 -r1.463
*** src/usr.bin/tmux/tmux.h	2014/05/13 07:54:20	1.462
--- src/usr.bin/tmux/tmux.h	2014/05/13 08:08:32	1.463
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.462 2014/05/13 07:54:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.463 2014/05/13 08:08:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 914,920 ****
  #define PANE_RESIZE 0x8
  #define PANE_FOCUSPUSH 0x10
  
! 	char		*cmd;
  	char		*shell;
  	int		 cwd;
  
--- 914,921 ----
  #define PANE_RESIZE 0x8
  #define PANE_FOCUSPUSH 0x10
  
! 	int		 argc;
! 	char	       **argv;
  	char		*shell;
  	int		 cwd;
  
***************
*** 1750,1755 ****
--- 1751,1757 ----
  int		 cmd_unpack_argv(char *, size_t, int, char ***);
  char	       **cmd_copy_argv(int, char **);
  void		 cmd_free_argv(int, char **);
+ char		*cmd_stringify_argv(int, char **);
  struct cmd	*cmd_parse(int, char **, const char *, u_int, char **);
  size_t		 cmd_print(struct cmd *, char *, size_t);
  struct session	*cmd_current_session(struct cmd_q *, int);
***************
*** 2140,2146 ****
  int		 window_index(struct window *, u_int *);
  struct window	*window_find_by_id(u_int);
  struct window	*window_create1(u_int, u_int);
! struct window	*window_create(const char *, const char *, const char *,
  		     const char *, int, struct environ *, struct termios *,
  		     u_int, u_int, u_int, char **);
  void		 window_destroy(struct window *);
--- 2142,2148 ----
  int		 window_index(struct window *, u_int *);
  struct window	*window_find_by_id(u_int);
  struct window	*window_create1(u_int, u_int);
! struct window	*window_create(const char *, int, char **, const char *,
  		     const char *, int, struct environ *, struct termios *,
  		     u_int, u_int, u_int, char **);
  void		 window_destroy(struct window *);
***************
*** 2166,2172 ****
  struct window_pane *window_pane_create(struct window *, u_int, u_int, u_int);
  void		 window_pane_destroy(struct window_pane *);
  void		 window_pane_timer_start(struct window_pane *);
! int		 window_pane_spawn(struct window_pane *, const char *,
  		     const char *, const char *, int, struct environ *,
  		     struct termios *, char **);
  void		 window_pane_resize(struct window_pane *, u_int, u_int);
--- 2168,2174 ----
  struct window_pane *window_pane_create(struct window *, u_int, u_int, u_int);
  void		 window_pane_destroy(struct window_pane *);
  void		 window_pane_timer_start(struct window_pane *);
! int		 window_pane_spawn(struct window_pane *, int, char **,
  		     const char *, const char *, int, struct environ *,
  		     struct termios *, char **);
  void		 window_pane_resize(struct window_pane *, u_int, u_int);
***************
*** 2304,2321 ****
  int		 session_alive(struct session *);
  struct session	*session_find(const char *);
  struct session	*session_find_by_id(u_int);
! struct session	*session_create(const char *, const char *, const char *, int,
! 		     struct environ *, struct termios *, int, u_int, u_int,
! 		     char **);
  void		 session_destroy(struct session *);
  int		 session_check_name(const char *);
  void		 session_update_activity(struct session *);
  struct session	*session_next_session(struct session *);
  struct session	*session_previous_session(struct session *);
! struct winlink	*session_new(struct session *, const char *, const char *,
  		     const char *, int, int, char **);
! struct winlink	*session_attach(
! 		     struct session *, struct window *, int, char **);
  int		 session_detach(struct session *, struct winlink *);
  struct winlink	*session_has(struct session *, struct window *);
  int		 session_next(struct session *, int);
--- 2306,2323 ----
  int		 session_alive(struct session *);
  struct session	*session_find(const char *);
  struct session	*session_find_by_id(u_int);
! struct session	*session_create(const char *, int, char **, const char *,
! 		     int, struct environ *, struct termios *, int, u_int,
! 		     u_int, char **);
  void		 session_destroy(struct session *);
  int		 session_check_name(const char *);
  void		 session_update_activity(struct session *);
  struct session	*session_next_session(struct session *);
  struct session	*session_previous_session(struct session *);
! struct winlink	*session_new(struct session *, const char *, int, char **,
  		     const char *, int, int, char **);
! struct winlink	*session_attach(struct session *, struct window *, int,
! 		     char **);
  int		 session_detach(struct session *, struct winlink *);
  struct winlink	*session_has(struct session *, struct window *);
  int		 session_next(struct session *, int);