===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/session.c	2013/10/10 11:58:24	1.40
--- src/usr.bin/tmux/session.c	2013/10/10 12:26:36	1.41
***************
*** 1,4 ****
! /* $OpenBSD: session.c,v 1.40 2013/10/10 11:58:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: session.c,v 1.41 2013/10/10 12:26:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 85,93 ****
  
  /* Create a new session. */
  struct session *
! session_create(const char *name, const char *cmd, const char *cwd,
!     struct environ *env, struct termios *tio, int idx, u_int sx, u_int sy,
!     char **cause)
  {
  	struct session	*s;
  
--- 85,92 ----
  
  /* Create a new session. */
  struct session *
! session_create(const char *name, const char *cmd, int cwd, struct environ *env,
!     struct termios *tio, int idx, u_int sx, u_int sy, char **cause)
  {
  	struct session	*s;
  
***************
*** 99,105 ****
  		fatal("gettimeofday failed");
  	session_update_activity(s);
  
! 	s->cwd = xstrdup(cwd);
  
  	s->curw = NULL;
  	TAILQ_INIT(&s->lastw);
--- 98,104 ----
  		fatal("gettimeofday failed");
  	session_update_activity(s);
  
! 	s->cwd = dup(cwd);
  
  	s->curw = NULL;
  	TAILQ_INIT(&s->lastw);
***************
*** 171,177 ****
  		winlink_remove(&s->windows, wl);
  	}
  
! 	free(s->cwd);
  
  	RB_INSERT(sessions, &dead_sessions, s);
  }
--- 170,176 ----
  		winlink_remove(&s->windows, wl);
  	}
  
! 	close(s->cwd);
  
  	RB_INSERT(sessions, &dead_sessions, s);
  }
***************
*** 227,234 ****
  
  /* Create a new window on a session. */
  struct winlink *
! session_new(struct session *s,
!     const char *name, const char *cmd, const char *cwd, int idx, char **cause)
  {
  	struct window	*w;
  	struct winlink	*wl;
--- 226,233 ----
  
  /* Create a new window on a session. */
  struct winlink *
! session_new(struct session *s, const char *name, const char *cmd, int cwd,
!     int idx, char **cause)
  {
  	struct window	*w;
  	struct winlink	*wl;
***************
*** 251,258 ****
  		shell = _PATH_BSHELL;
  
  	hlimit = options_get_number(&s->options, "history-limit");
! 	w = window_create(
! 	    name, cmd, shell, cwd, &env, s->tio, s->sx, s->sy, hlimit, cause);
  	if (w == NULL) {
  		winlink_remove(&s->windows, wl);
  		environ_free(&env);
--- 250,257 ----
  		shell = _PATH_BSHELL;
  
  	hlimit = options_get_number(&s->options, "history-limit");
! 	w = window_create(name, cmd, shell, cwd, &env, s->tio, s->sx, s->sy,
! 	    hlimit, cause);
  	if (w == NULL) {
  		winlink_remove(&s->windows, wl);
  		environ_free(&env);