===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-session.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -c -r1.95 -r1.96
*** src/usr.bin/tmux/cmd-new-session.c	2016/11/16 11:37:16	1.95
--- src/usr.bin/tmux/cmd-new-session.c	2017/01/13 11:56:43	1.96
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-session.c,v 1.95 2016/11/16 11:37:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-new-session.c,v 1.96 2017/01/13 11:56:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 74,81 ****
  	struct environ		*env;
  	struct termios		 tio, *tiop;
  	const char		*newname, *target, *update, *errstr, *template;
! 	const char		*path, *cwd, *to_free = NULL;
! 	char		       **argv, *cmd, *cause, *cp;
  	int			 detached, already_attached, idx, argc;
  	u_int			 sx, sy;
  	struct format_tree	*ft;
--- 74,81 ----
  	struct environ		*env;
  	struct termios		 tio, *tiop;
  	const char		*newname, *target, *update, *errstr, *template;
! 	const char		*path, *cmd, *cwd, *to_free = NULL;
! 	char		       **argv, *cause, *cp;
  	int			 detached, already_attached, idx, argc;
  	u_int			 sx, sy;
  	struct format_tree	*ft;
***************
*** 217,223 ****
  		cmd = options_get_string(global_s_options, "default-command");
  		if (cmd != NULL && *cmd != '\0') {
  			argc = 1;
! 			argv = &cmd;
  		} else {
  			argc = 0;
  			argv = NULL;
--- 217,223 ----
  		cmd = options_get_string(global_s_options, "default-command");
  		if (cmd != NULL && *cmd != '\0') {
  			argc = 1;
! 			argv = (char **)&cmd;
  		} else {
  			argc = 0;
  			argv = NULL;