===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-split-window.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/tmux/cmd-split-window.c	2009/07/26 12:58:44	1.7
+++ src/usr.bin/tmux/cmd-split-window.c	2009/08/08 21:52:43	1.8
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-split-window.c,v 1.7 2009/07/26 12:58:44 nicm Exp $ */
+/* $OpenBSD: cmd-split-window.c,v 1.8 2009/08/08 21:52:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -149,7 +149,7 @@
 	struct winlink			*wl;
 	struct window			*w;
 	struct window_pane		*wp;
-	const char		       **env;
+	struct environ			 env;
 	char		 		*cmd, *cwd, *cause;
 	u_int				 hlimit;
 	int				 size;
@@ -159,7 +159,10 @@
 		return (-1);
 	w = wl->window;
 
-	env = server_fill_environ(s);
+	environ_init(&env);
+	environ_copy(&global_environ, &env);
+	environ_copy(&s->environ, &env);
+	server_fill_environ(s, &env);
 
 	cmd = data->cmd;
 	if (cmd == NULL)
@@ -181,7 +184,7 @@
 		type = LAYOUT_LEFTRIGHT;
 
 	wp = window_add_pane(w, hlimit);
-	if (window_pane_spawn(wp, cmd, cwd, env, &cause) != 0)
+	if (window_pane_spawn(wp, cmd, cwd, &env, &cause) != 0)
 		goto error;
 	if (layout_split_pane(w->active, type, size, wp) != 0) {
 		cause = xstrdup("pane too small");
@@ -197,9 +200,11 @@
 	} else
 		server_status_session(s);
 
+	environ_free(&env);
 	return (0);
 
 error:
+	environ_free(&env);
 	if (wp != NULL)
 		window_remove_pane(w, wp);
 	ctx->error(ctx, "create pane failed: %s", cause);