===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -c -r1.143 -r1.144
*** src/usr.bin/tmux/server-client.c	2015/06/14 10:07:44	1.143
--- src/usr.bin/tmux/server-client.c	2015/07/13 15:49:31	1.144
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.143 2015/06/14 10:07:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.144 2015/07/13 15:49:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 96,101 ****
--- 96,103 ----
  
  	environ_init(&c->environ);
  
+ 	c->cwd = -1;
+ 
  	c->cmdq = cmdq_new(c);
  	c->cmdq->client_exit = 1;
  
***************
*** 1253,1264 ****
  
  	if (c->fd == -1)
  		return;
! 	if (!isatty(c->fd)) {
  		close(c->fd);
  		c->fd = -1;
  		return;
  	}
- 	tty_init(&c->tty, c, c->fd, c->term);
  	if (c->flags & CLIENT_UTF8)
  		c->tty.flags |= TTY_UTF8;
  	if (c->flags & CLIENT_256COLOURS)
--- 1255,1265 ----
  
  	if (c->fd == -1)
  		return;
! 	if (tty_init(&c->tty, c, c->fd, c->term) != 0) {
  		close(c->fd);
  		c->fd = -1;
  		return;
  	}
  	if (c->flags & CLIENT_UTF8)
  		c->tty.flags |= TTY_UTF8;
  	if (c->flags & CLIENT_256COLOURS)