===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/job.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/tmux/job.c	2015/06/17 16:44:49	1.36
--- src/usr.bin/tmux/job.c	2015/10/28 09:51:55	1.37
***************
*** 1,4 ****
! /* $OpenBSD: job.c,v 1.36 2015/06/17 16:44:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: job.c,v 1.37 2015/10/28 09:51:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 45,66 ****
      void (*callbackfn)(struct job *), void (*freefn)(void *), void *data)
  {
  	struct job	*job;
! 	struct environ	 env;
  	pid_t		 pid;
  	int		 nullfd, out[2];
  
  	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0)
  		return (NULL);
  
! 	environ_init(&env);
! 	environ_copy(&global_environ, &env);
  	if (s != NULL)
! 		environ_copy(&s->environ, &env);
! 	server_fill_environ(s, &env);
  
  	switch (pid = fork()) {
  	case -1:
! 		environ_free(&env);
  		close(out[0]);
  		close(out[1]);
  		return (NULL);
--- 45,66 ----
      void (*callbackfn)(struct job *), void (*freefn)(void *), void *data)
  {
  	struct job	*job;
! 	struct environ	*env;
  	pid_t		 pid;
  	int		 nullfd, out[2];
  
  	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0)
  		return (NULL);
  
! 	env = environ_create();
! 	environ_copy(global_environ, env);
  	if (s != NULL)
! 		environ_copy(s->environ, env);
! 	server_fill_environ(s, env);
  
  	switch (pid = fork()) {
  	case -1:
! 		environ_free(env);
  		close(out[0]);
  		close(out[1]);
  		return (NULL);
***************
*** 70,77 ****
  		if (cwd != -1 && fchdir(cwd) != 0)
  			chdir("/");
  
! 		environ_push(&env);
! 		environ_free(&env);
  
  		if (dup2(out[1], STDIN_FILENO) == -1)
  			fatal("dup2 failed");
--- 70,77 ----
  		if (cwd != -1 && fchdir(cwd) != 0)
  			chdir("/");
  
! 		environ_push(env);
! 		environ_free(env);
  
  		if (dup2(out[1], STDIN_FILENO) == -1)
  			fatal("dup2 failed");
***************
*** 96,102 ****
  	}
  
  	/* parent */
! 	environ_free(&env);
  	close(out[1]);
  
  	job = xmalloc(sizeof *job);
--- 96,102 ----
  	}
  
  	/* parent */
! 	environ_free(env);
  	close(out[1]);
  
  	job = xmalloc(sizeof *job);