diff options
| author |   nicm <nicm@openbsd.org> | 2014-04-17 13:02:59 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2014-04-17 13:02:59 +0000 |
| commit | 1a0db3015ea731ed484e4af0811ff30aef5f77dc (patch) | |
| tree | d4cc69063d740f9490fc4436cd841487c5c2d569 /usr.bin/tmux/session.c | |
| parent | Wrap some long lines. (diff) | |
| download | wireguard-openbsd-1a0db3015ea731ed484e4af0811ff30aef5f77dc.tar.xz wireguard-openbsd-1a0db3015ea731ed484e4af0811ff30aef5f77dc.zip | |
Set PATH explicitly, either from client or session
environment. Previously it came from the session environment. From J
Raynor.
Diffstat (limited to 'usr.bin/tmux/session.c')
| -rw-r--r-- | usr.bin/tmux/session.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr.bin/tmux/session.c b/usr.bin/tmux/session.c index ec8996ecf91..c458366996f 100644 --- a/usr.bin/tmux/session.c +++ b/usr.bin/tmux/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.42 2014/01/22 14:00:08 nicm Exp $ */ +/* $OpenBSD: session.c,v 1.43 2014/04/17 13:02:59 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -85,8 +85,9 @@ session_find_by_id(u_int id) /* Create a new session. */ struct session * -session_create(const char *name, const char *cmd, int cwd, struct environ *env, - struct termios *tio, int idx, u_int sx, u_int sy, char **cause) +session_create(const char *name, const char *cmd, const char *path, int cwd, + struct environ *env, struct termios *tio, int idx, u_int sx, u_int sy, + char **cause) { struct session *s; @@ -132,7 +133,7 @@ session_create(const char *name, const char *cmd, int cwd, struct environ *env, RB_INSERT(sessions, &sessions, s); if (cmd != NULL) { - if (session_new(s, NULL, cmd, cwd, idx, cause) == NULL) { + if (session_new(s, NULL, cmd, path, cwd, idx, cause) == NULL) { session_destroy(s); return (NULL); } @@ -226,8 +227,8 @@ session_previous_session(struct session *s) /* Create a new window on a session. */ struct winlink * -session_new(struct session *s, const char *name, const char *cmd, int cwd, - int idx, char **cause) +session_new(struct session *s, const char *name, const char *cmd, + const char *path, int cwd, int idx, char **cause) { struct window *w; struct winlink *wl; @@ -250,8 +251,8 @@ session_new(struct session *s, const char *name, const char *cmd, int cwd, shell = _PATH_BSHELL; hlimit = options_get_number(&s->options, "history-limit"); - w = window_create(name, cmd, shell, cwd, &env, s->tio, s->sx, s->sy, - hlimit, cause); + w = window_create(name, cmd, path, shell, cwd, &env, s->tio, s->sx, + s->sy, hlimit, cause); if (w == NULL) { winlink_remove(&s->windows, wl); environ_free(&env); |