diff options
| author | nicm <nicm> | 2015-12-16 21:47:00 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-12-16 21:47:00 +0000 |
| commit | 8eb1a7d5dc8d66ca7d17c72e4d8d0e58d6fd2824 (patch) | |
| tree | df2f03c8df687fbc577ee8328fd83a992224cc3d | |
| parent | 909b737289ee24f1c78c13c10d728a1cf990912d (diff) | |
showenv and setenv need to be CANFAIL.
| -rw-r--r-- | cmd-set-environment.c | 4 | ||||
| -rw-r--r-- | cmd-show-environment.c | 2 |
2 files changed, 3 insertions, 3 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; diff --git a/cmd-show-environment.c b/cmd-show-environment.c index ad9e9e37..54baafe4 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -94,7 +94,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq) struct environ *env; struct environ_entry *envent; - 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; |