diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-13 10:30:00 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-13 10:30:00 +0100 |
| commit | b117c3b81217a11946ac784cfbe2ef1f3725b207 (patch) | |
| tree | 196cc4a27cb75def4466d418cb91dd3fcfdfbf5b /cmd-set-environment.c | |
| parent | 52e3d960e7ebe2006509d48c427ffd8f25a0cf52 (diff) | |
| parent | c20eb0c0ae3347c768894a6355adfd7ebae6f2f3 (diff) | |
| download | rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.tar.gz rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.tar.bz2 rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-environment.c')
| -rw-r--r-- | cmd-set-environment.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c index 248f734a..72e40ded 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -46,7 +46,7 @@ const struct cmd_entry cmd_set_environment_entry = { static enum cmd_retval cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item) { - struct args *args = self->args; + struct args *args = cmd_get_args(self); struct environ *env; const char *name, *value, *target; @@ -65,7 +65,7 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item) else value = args->argv[1]; - if (args_has(self->args, 'g')) + if (args_has(args, 'g')) env = global_environ; else { if (item->target.s == NULL) { @@ -79,13 +79,13 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item) env = item->target.s->environ; } - if (args_has(self->args, 'u')) { + if (args_has(args, 'u')) { if (value != NULL) { cmdq_error(item, "can't specify a value with -u"); return (CMD_RETURN_ERROR); } environ_unset(env, name); - } else if (args_has(self->args, 'r')) { + } else if (args_has(args, 'r')) { if (value != NULL) { cmdq_error(item, "can't specify a value with -r"); return (CMD_RETURN_ERROR); |