diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-03-03 16:01:11 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-03-03 16:01:11 +0000 |
| commit | 6c35d17800b5d745272c45bb4c71bde80780c415 (patch) | |
| tree | 818b03a3534a51d98277f2badc0df2159522510d /cmd-set-environment.c | |
| parent | 45d62482daf5264c47d68ae07061ea99382c7a54 (diff) | |
| parent | df0983af39922f2ee747a244c1c718ba7ca28910 (diff) | |
| download | rtmux-6c35d17800b5d745272c45bb4c71bde80780c415.tar.gz rtmux-6c35d17800b5d745272c45bb4c71bde80780c415.tar.bz2 rtmux-6c35d17800b5d745272c45bb4c71bde80780c415.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-environment.c')
| -rw-r--r-- | cmd-set-environment.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c index 55bdaa9a..ba295ea6 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -47,7 +47,7 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct environ *env; - const char *name, *value; + const char *name, *value, *target; name = args->argv[0]; if (*name == '\0') { @@ -64,10 +64,19 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq) else value = args->argv[1]; - if (args_has(self->args, 'g') || cmdq->state.tflag.s == NULL) + if (args_has(self->args, 'g')) env = global_environ; - else + else { + if (cmdq->state.tflag.s == NULL) { + target = args_get(args, 't'); + if (target != NULL) + cmdq_error(cmdq, "no such session: %s", target); + else + cmdq_error(cmdq, "no current session"); + return (CMD_RETURN_ERROR); + } env = cmdq->state.tflag.s->environ; + } if (args_has(self->args, 'u')) { if (value != NULL) { |