diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-04-28 23:02:30 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-04-28 23:02:30 +0100 |
| commit | 3ab229da706bc8cffadfa500708937c1e3e84145 (patch) | |
| tree | fdd4c60ba6addc019b8d249c5deb3d5d14f92591 /cmd-respawn-pane.c | |
| parent | 2cecabd75ecb19e46c221c76f642807869ae63e6 (diff) | |
| parent | c4b0da5513ee4c9692f0980408b0da2ee7e3a553 (diff) | |
| download | rtmux-3ab229da706bc8cffadfa500708937c1e3e84145.tar.gz rtmux-3ab229da706bc8cffadfa500708937c1e3e84145.tar.bz2 rtmux-3ab229da706bc8cffadfa500708937c1e3e84145.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-respawn-pane.c')
| -rw-r--r-- | cmd-respawn-pane.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/cmd-respawn-pane.c b/cmd-respawn-pane.c index 44234315..5e23fa15 100644 --- a/cmd-respawn-pane.c +++ b/cmd-respawn-pane.c @@ -34,9 +34,9 @@ const struct cmd_entry cmd_respawn_pane_entry = { .name = "respawn-pane", .alias = "respawnp", - .args = { "c:kt:", 0, -1 }, - .usage = "[-c start-directory] [-k] " CMD_TARGET_PANE_USAGE - " [command]", + .args = { "c:e:kt:", 0, -1 }, + .usage = "[-k] [-c start-directory] [-e environment] " + CMD_TARGET_PANE_USAGE " [command]", .target = { 't', CMD_FIND_PANE, 0 }, @@ -53,6 +53,8 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item) struct winlink *wl = item->target.wl; struct window_pane *wp = item->target.wp; char *cause = NULL; + const char *add; + struct args_value *value; memset(&sc, 0, sizeof sc); sc.item = item; @@ -65,6 +67,13 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item) sc.name = NULL; sc.argc = args->argc; sc.argv = args->argv; + sc.environ = environ_create(); + + add = args_first_value(args, 'e', &value); + while (add != NULL) { + environ_put(sc.environ, add); + add = args_next_value(&value); + } sc.idx = -1; sc.cwd = args_get(args, 'c'); @@ -82,5 +91,6 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item) wp->flags |= PANE_REDRAW; server_status_window(wp->window); + environ_free(sc.environ); return (CMD_RETURN_NORMAL); } |