=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-respawn-pane.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- src/usr.bin/tmux/cmd-respawn-pane.c 2019/04/17 14:37:48 1.28 +++ src/usr.bin/tmux/cmd-respawn-pane.c 2019/04/28 20:05:50 1.29 @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-respawn-pane.c,v 1.28 2019/04/17 14:37:48 nicm Exp $ */ +/* $OpenBSD: cmd-respawn-pane.c,v 1.29 2019/04/28 20:05:50 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -34,9 +34,9 @@ .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 @@ 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,7 +67,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'); @@ -82,5 +91,6 @@ wp->flags |= PANE_REDRAW; server_status_window(wp->window); + environ_free(sc.environ); return (CMD_RETURN_NORMAL); }