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-show-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-show-environment.c')
| -rw-r--r-- | cmd-show-environment.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-show-environment.c b/cmd-show-environment.c index 0d2f7dd9..be6209dd 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -69,7 +69,7 @@ static void cmd_show_environment_print(struct cmd *self, struct cmdq_item *item, struct environ_entry *envent) { - struct args *args = self->args; + struct args *args = cmd_get_args(self); char *escaped; if (!args_has(args, 'h') && (envent->flags & ENVIRON_HIDDEN)) @@ -77,7 +77,7 @@ cmd_show_environment_print(struct cmd *self, struct cmdq_item *item, if (args_has(args, 'h') && (~envent->flags & ENVIRON_HIDDEN)) return; - if (!args_has(self->args, 's')) { + if (!args_has(args, 's')) { if (envent->value != NULL) cmdq_print(item, "%s=%s", envent->name, envent->value); else @@ -97,7 +97,7 @@ cmd_show_environment_print(struct cmd *self, struct cmdq_item *item, static enum cmd_retval cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item) { - struct args *args = self->args; + struct args *args = cmd_get_args(self); struct environ *env; struct environ_entry *envent; const char *target; @@ -109,7 +109,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item) } } - if (args_has(self->args, 'g')) + if (args_has(args, 'g')) env = global_environ; else { if (item->target.s == NULL) { |