diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-12-16 22:01:08 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-12-16 22:01:08 +0000 |
| commit | 7c94dae702798db66424897159a44832f5dbc392 (patch) | |
| tree | 255b7f4f770c213a787618e92d56fa19066c0c94 /cmd-set-environment.c | |
| parent | f7a6482e6b2f3fec33f87d0c9fe69cfe7efc6daf (diff) | |
| parent | 8eb1a7d5dc8d66ca7d17c72e4d8d0e58d6fd2824 (diff) | |
| download | rtmux-7c94dae702798db66424897159a44832f5dbc392.tar.gz rtmux-7c94dae702798db66424897159a44832f5dbc392.tar.bz2 rtmux-7c94dae702798db66424897159a44832f5dbc392.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-environment.c')
| -rw-r--r-- | cmd-set-environment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c index 0808dcb1..f701d7d9 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -36,7 +36,7 @@ const struct cmd_entry cmd_set_environment_entry = { .args = { "grt:u", 1, 2 }, .usage = "[-gru] " CMD_TARGET_SESSION_USAGE " name [value]", - .tflag = CMD_SESSION, + .tflag = CMD_SESSION_CANFAIL, .flags = 0, .exec = cmd_set_environment_exec @@ -64,7 +64,7 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq) else value = args->argv[1]; - if (args_has(self->args, 'g')) + if (args_has(self->args, 'g') || cmdq->state.tflag.s == NULL) env = global_environ; else env = cmdq->state.tflag.s->environ; |