diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
| commit | a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a (patch) | |
| tree | ebfcd8a38514651c4657dac40601a5aafa360b89 /cmd-respawn-pane.c | |
| parent | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (diff) | |
| parent | bf9c933caed5c74be3c9c4da02d7c57a9dcf091d (diff) | |
| download | rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.gz rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.bz2 rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-respawn-pane.c')
| -rw-r--r-- | cmd-respawn-pane.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cmd-respawn-pane.c b/cmd-respawn-pane.c index 6575e8e4..864b45b8 100644 --- a/cmd-respawn-pane.c +++ b/cmd-respawn-pane.c @@ -46,7 +46,7 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq) struct window *w; struct window_pane *wp; struct session *s; - struct environ env; + struct environ *env; const char *path; char *cause; u_int idx; @@ -64,10 +64,10 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_ERROR); } - environ_init(&env); - environ_copy(&global_environ, &env); - environ_copy(&s->environ, &env); - server_fill_environ(s, &env); + env = environ_create(); + environ_copy(global_environ, env); + environ_copy(s->environ, env); + server_fill_environ(s, env); window_pane_reset_mode(wp); screen_reinit(&wp->base); @@ -75,22 +75,22 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq) path = NULL; if (cmdq->client != NULL && cmdq->client->session == NULL) - envent = environ_find(&cmdq->client->environ, "PATH"); + envent = environ_find(cmdq->client->environ, "PATH"); else - envent = environ_find(&s->environ, "PATH"); + envent = environ_find(s->environ, "PATH"); if (envent != NULL) path = envent->value; - if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, -1, &env, + if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, -1, env, s->tio, &cause) != 0) { cmdq_error(cmdq, "respawn pane failed: %s", cause); free(cause); - environ_free(&env); + environ_free(env); return (CMD_RETURN_ERROR); } wp->flags |= PANE_REDRAW; server_status_window(w); - environ_free(&env); + environ_free(env); return (CMD_RETURN_NORMAL); } |