diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-12-13 16:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-12-13 16:01:13 +0000 |
| commit | ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4 (patch) | |
| tree | 72ebffc1c0617c28ddc421f24045f148b7d59e36 /cmd-show-environment.c | |
| parent | 92f187d1c2d84322860dc595da604260999a52f0 (diff) | |
| parent | ff599f4004aaa6aae325ece5cbc996e2dc6f0b4f (diff) | |
| download | rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.tar.gz rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.tar.bz2 rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-show-environment.c')
| -rw-r--r-- | cmd-show-environment.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cmd-show-environment.c b/cmd-show-environment.c index 96cfa289..8feb2e22 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -37,7 +37,7 @@ const struct cmd_entry cmd_show_environment_entry = { "show-environment", "showenv", "gst:", 0, 1, "[-gs] " CMD_TARGET_SESSION_USAGE " [name]", - 0, + CMD_SESSION_T, cmd_show_environment_exec }; @@ -86,18 +86,13 @@ enum cmd_retval cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; - struct session *s; struct environ *env; struct environ_entry *envent; if (args_has(self->args, 'g')) env = global_environ; - else { - s = cmd_find_session(cmdq, args_get(args, 't'), 0); - if (s == NULL) - return (CMD_RETURN_ERROR); - env = s->environ; - } + else + env = cmdq->state.tflag.s->environ; if (args->argc != 0) { envent = environ_find(env, args->argv[0]); |