=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-split-window.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- src/usr.bin/tmux/cmd-split-window.c 2019/04/26 11:38:51 1.93 +++ src/usr.bin/tmux/cmd-split-window.c 2019/04/28 20:05:50 1.94 @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-split-window.c,v 1.93 2019/04/26 11:38:51 nicm Exp $ */ +/* $OpenBSD: cmd-split-window.c,v 1.94 2019/04/28 20:05:50 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -40,8 +40,8 @@ .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 @@ 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,7 +118,14 @@ 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_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); }