diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-23 11:26:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-23 11:26:11 +0100 |
| commit | 953c3ef47a1933d38308075c1bacc7ea8d38301b (patch) | |
| tree | 6484bdd51ecedbb5888717db271c151257ec87f5 /cmd-respawn-pane.c | |
| parent | 12e9c974fadc5ed6f0e7db10c40d5a0d55e0da8a (diff) | |
| parent | 64613b9d411a7c76a50a2f9c66df345f082fce25 (diff) | |
| download | rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.tar.gz rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.tar.bz2 rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tmux.1
window.c
Diffstat (limited to 'cmd-respawn-pane.c')
| -rw-r--r-- | cmd-respawn-pane.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cmd-respawn-pane.c b/cmd-respawn-pane.c index bcde2754..9ac5b0b8 100644 --- a/cmd-respawn-pane.c +++ b/cmd-respawn-pane.c @@ -48,9 +48,10 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq) struct window_pane *wp; struct session *s; struct environ env; - const char *cmd; + const char *cmd, *path; char *cause; u_int idx; + struct environ_entry *envent; if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL) return (CMD_RETURN_ERROR); @@ -77,7 +78,17 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq) cmd = args->argv[0]; else cmd = NULL; - if (window_pane_spawn(wp, cmd, NULL, -1, &env, s->tio, &cause) != 0) { + + path = NULL; + if (cmdq->client != NULL && cmdq->client->session == NULL) + envent = environ_find(&cmdq->client->environ, "PATH"); + else + envent = environ_find(&s->environ, "PATH"); + if (envent != NULL) + path = envent->value; + + if (window_pane_spawn(wp, cmd, path, NULL, -1, &env, s->tio, + &cause) != 0) { cmdq_error(cmdq, "respawn pane failed: %s", cause); free(cause); environ_free(&env); |