diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-11-25 16:37:30 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-11-25 16:37:30 +0000 |
commit | 890d8da2e3588d416ef178e2e74ed3df226a6040 (patch) | |
tree | 3d024b90830e8afe48f75f0cb741965a5bb76015 /window.c | |
parent | 0a2ef2b932f37d54157d82e526a8097caf9143ba (diff) | |
parent | ac8678aefe157d7e40c5bcedd12333eaedf0df92 (diff) | |
download | rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.tar.gz rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.tar.bz2 rtmux-890d8da2e3588d416ef178e2e74ed3df226a6040.zip |
Merge branch 'obsd-master'
Conflicts:
log.c
proc.c
tmux.c
Diffstat (limited to 'window.c')
-rw-r--r-- | window.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -810,7 +810,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; #ifdef HAVE_UTEMPTER @@ -871,9 +871,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); |