From dbfee6a468172899759a86c7bf50169053adce45 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 9 Mar 2017 17:02:38 +0000
Subject: Move server_fill_environ into environ.c and move some other common
 code into it.

---
 session.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'session.c')

diff --git a/session.c b/session.c
index 5ffa2b87..cb8ed1eb 100644
--- a/session.c
+++ b/session.c
@@ -355,16 +355,12 @@ session_new(struct session *s, const char *name, int argc, char **argv,
 	}
 	wl->session = s;
 
-	env = environ_create();
-	environ_copy(global_environ, env);
-	environ_copy(s->environ, env);
-	server_fill_environ(s, env);
-
 	shell = options_get_string(s->options, "default-shell");
 	if (*shell == '\0' || areshell(shell))
 		shell = _PATH_BSHELL;
 
 	hlimit = options_get_number(s->options, "history-limit");
+	env = environ_for_session(s);
 	w = window_create_spawn(name, argc, argv, path, shell, cwd, env, s->tio,
 	    s->sx, s->sy, hlimit, cause);
 	if (w == NULL) {
@@ -373,8 +369,8 @@ session_new(struct session *s, const char *name, int argc, char **argv,
 		return (NULL);
 	}
 	winlink_set_window(wl, w);
-	notify_session_window("window-linked", s, w);
 	environ_free(env);
+	notify_session_window("window-linked", s, w);
 
 	session_group_synchronize_from(s);
 	return (wl);
-- 
cgit