From 62d3af17f9e6aec244ab1d91c1c46fdbbf6f8a86 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 23:46:15 +0000
Subject: Make environ_set va_args and use it to tidy up some calls. Also add a
 missing word in manpage (from jmc).

---
 window.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'window.c')

diff --git a/window.c b/window.c
index 8ee517a1..deda2895 100644
--- a/window.c
+++ b/window.c
@@ -808,7 +808,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
     struct termios *tio, char **cause)
 {
 	struct winsize	 ws;
-	char		*argv0, *cmd, **argvp, paneid[16];
+	char		*argv0, *cmd, **argvp;
 	const char	*ptr, *first, *home;
 	struct termios	 tio2;
 	int		 i;
@@ -863,9 +863,8 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
 		closefrom(STDERR_FILENO + 1);
 
 		if (path != NULL)
-			environ_set(env, "PATH", path);
-		xsnprintf(paneid, sizeof paneid, "%%%u", wp->id);
-		environ_set(env, "TMUX_PANE", paneid);
+			environ_set(env, "PATH", "%s", path);
+		environ_set(env, "TMUX_PANE", "%%%u", wp->id);
 		environ_push(env);
 
 		clear_signals(1);
-- 
cgit