Move server_fill_environ into environ.c and move some other common code

into it.

1 files changed, 5 insertions, 9 deletions

diff --git a/cmd-split-window.c b/cmd-split-window.c
index 064d1f5f..4d061d94 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -71,11 +71,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 
 	server_unzoom_window(w);
 
-	env = environ_create();
-	environ_copy(global_environ, env);
-	environ_copy(s->environ, env);
-	server_fill_environ(s, env);
-
 	if (args->argc == 0) {
 		cmd = options_get_string(s->options, "default-command");
 		if (cmd != NULL && *cmd != '\0') {
@@ -148,9 +143,13 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	if (envent != NULL)
 		path = envent->value;
 
+	env = environ_for_session(s);
 	if (window_pane_spawn(new_wp, argc, argv, path, shell, cwd, env,
-	    s->tio, &cause) != 0)
+	    s->tio, &cause) != 0) {
+		environ_free(env);
 		goto error;
+	}
+	environ_free(env);
 
 	server_redraw_window(w);
 
@@ -161,8 +160,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	} else
 		server_status_session(s);
 
-	environ_free(env);
-
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
 			template = SPLIT_WINDOW_TEMPLATE;
@@ -186,7 +183,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 	return (CMD_RETURN_NORMAL);
 
 error:
-	environ_free(env);
 	if (new_wp != NULL) {
 		layout_close_pane(new_wp);
 		window_remove_pane(w, new_wp);