summaryrefslogtreecommitdiffstats
path: root/cmd-split-window.c
diff options
context:
space:
mode:
authornicm <nicm>2019-04-28 20:05:50 +0000
committernicm <nicm>2019-04-28 20:05:50 +0000
commitc4b0da5513ee4c9692f0980408b0da2ee7e3a553 (patch)
tree3bef007901ae51d68f18454f1bbf8a9c2027e11e /cmd-split-window.c
parentdfb7bb683057d08303955c49073f4b475bd0e2d6 (diff)
Support multiple occurances of the same argument. Use this for a new
flag -e to new-window, split-window, respawn-window, respawn-pane to pass environment variables into the newly created process. From Steffen Christgau in GitHub issue 1697.
Diffstat (limited to 'cmd-split-window.c')
-rw-r--r--cmd-split-window.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c
index 597a5c96..3b9040dc 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -40,8 +40,8 @@ const struct cmd_entry cmd_split_window_entry = {
.name = "split-window",
.alias = "splitw",
- .args = { "bc:dfF:l:hp:Pt:v", 0, -1 },
- .usage = "[-bdfhvP] [-c start-directory] [-F format] "
+ .args = { "bc:de:fF:l:hp:Pt:v", 0, -1 },
+ .usage = "[-bdefhvP] [-c start-directory] [-e environment] [-F format] "
"[-p percentage|-l size] " CMD_TARGET_PANE_USAGE " [command]",
.target = { 't', CMD_FIND_PANE, 0 },
@@ -64,8 +64,9 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
struct layout_cell *lc;
struct cmd_find_state fs;
int size, percentage, flags;
- const char *template;
+ const char *template, *add;
char *cause, *cp;
+ struct args_value *value;
if (args_has(args, 'h'))
type = LAYOUT_LEFTRIGHT;
@@ -117,6 +118,13 @@ cmd_split_window_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');
@@ -146,5 +154,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
cmd_find_from_winlink_pane(&fs, wl, new_wp, 0);
cmdq_insert_hook(s, item, &fs, "after-split-window");
+ environ_free(sc.environ);
return (CMD_RETURN_NORMAL);
}