Merge branch 'obsd-master'

1 files changed, 9 insertions, 9 deletions

diff --git a/job.c b/job.c
index dc11c4c8..47274db1 100644
--- a/job.c
+++ b/job.c
@@ -44,22 +44,22 @@ job_run(const char *cmd, struct session *s, int cwd,
     void (*callbackfn)(struct job *), void (*freefn)(void *), void *data)
 {
 	struct job	*job;
-	struct environ	 env;
+	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);
+	env = environ_create();
+	environ_copy(global_environ, env);
 	if (s != NULL)
-		environ_copy(&s->environ, &env);
-	server_fill_environ(s, &env);
+		environ_copy(s->environ, env);
+	server_fill_environ(s, env);
 
 	switch (pid = fork()) {
 	case -1:
-		environ_free(&env);
+		environ_free(env);
 		close(out[0]);
 		close(out[1]);
 		return (NULL);
@@ -69,8 +69,8 @@ job_run(const char *cmd, struct session *s, int cwd,
 		if (cwd != -1 && fchdir(cwd) != 0)
 			chdir("/");
 
-		environ_push(&env);
-		environ_free(&env);
+		environ_push(env);
+		environ_free(env);
 
 		if (dup2(out[1], STDIN_FILENO) == -1)
 			fatal("dup2 failed");
@@ -95,7 +95,7 @@ job_run(const char *cmd, struct session *s, int cwd,
 	}
 
 	/* parent */
-	environ_free(&env);
+	environ_free(env);
 	close(out[1]);
 
 	job = xmalloc(sizeof *job);