===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/job.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tmux/job.c	2009/10/11 08:58:05	1.5
--- src/usr.bin/tmux/job.c	2009/10/20 22:15:32	1.6
***************
*** 1,4 ****
! /* $OpenBSD: job.c,v 1.5 2009/10/11 08:58:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: job.c,v 1.6 2009/10/20 22:15:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 153,158 ****
--- 153,164 ----
  		sigreset();
  		/* XXX environ? */
  
+ 		close(out[1]);
+ 		if (dup2(out[0], STDOUT_FILENO) == -1)
+ 			fatal("dup2 failed");
+ 		if (out[0] != STDOUT_FILENO)
+ 			close(out[0]);
+ 
  		nullfd = open(_PATH_DEVNULL, O_RDONLY, 0);
  		if (nullfd < 0)
  			fatal("open failed");
***************
*** 162,173 ****
  			fatal("dup2 failed");
  		if (nullfd != STDIN_FILENO && nullfd != STDERR_FILENO)
  			close(nullfd);
- 
- 		close(out[1]);
- 		if (dup2(out[0], STDOUT_FILENO) == -1)
- 			fatal("dup2 failed");
- 		if (out[0] != STDOUT_FILENO)
- 			close(out[0]);
  
  		execl(_PATH_BSHELL, "sh", "-c", job->cmd, (char *) NULL);
  		fatal("execl failed");
--- 168,173 ----