diff options
| author | nicm <nicm> | 2020-04-13 10:59:58 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2020-04-13 10:59:58 +0000 |
| commit | 04cdd035250b93b728678d515b69690653dced4e (patch) | |
| tree | 34edc5f4affb9a640a95c7d531eb06770b6ea3c9 /cmd-show-environment.c | |
| parent | c20eb0c0ae3347c768894a6355adfd7ebae6f2f3 (diff) | |
| download | rtmux-04cdd035250b93b728678d515b69690653dced4e.tar.gz rtmux-04cdd035250b93b728678d515b69690653dced4e.tar.bz2 rtmux-04cdd035250b93b728678d515b69690653dced4e.zip | |
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its
use more clearly defined and preparation for some future work).
Diffstat (limited to 'cmd-show-environment.c')
| -rw-r--r-- | cmd-show-environment.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cmd-show-environment.c b/cmd-show-environment.c index be6209dd..3ad31400 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -98,13 +98,14 @@ static enum cmd_retval cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = cmd_get_args(self); + struct cmd_find_state *target = cmdq_get_target(item); struct environ *env; struct environ_entry *envent; - const char *target; + const char *tflag; - if ((target = args_get(args, 't')) != NULL) { - if (item->target.s == NULL) { - cmdq_error(item, "no such session: %s", target); + if ((tflag = args_get(args, 't')) != NULL) { + if (target->s == NULL) { + cmdq_error(item, "no such session: %s", tflag); return (CMD_RETURN_ERROR); } } @@ -112,15 +113,15 @@ cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item) if (args_has(args, 'g')) env = global_environ; else { - if (item->target.s == NULL) { - target = args_get(args, 't'); - if (target != NULL) - cmdq_error(item, "no such session: %s", target); + if (target->s == NULL) { + tflag = args_get(args, 't'); + if (tflag != NULL) + cmdq_error(item, "no such session: %s", tflag); else cmdq_error(item, "no current session"); return (CMD_RETURN_ERROR); } - env = item->target.s->environ; + env = target->s->environ; } if (args->argc != 0) { |