diff options
| author | nicm <nicm> | 2017-04-22 10:22:39 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2017-04-22 10:22:39 +0000 |
| commit | ee45a8a149e1a3c8fe7c232a9e32f3a007e21bee (patch) | |
| tree | 21cc9cafd10d55cd7cd92ec616d08ac59adc4a0a /cmd-show-environment.c | |
| parent | 2c0f826c360fc5a8f0e125759b596eb28441ba65 (diff) | |
Get rid of the extra layer of flags and cmd_prepare() and just store the
CMD_FIND_* flags in the cmd_entry and call it for the command. Commands
with special requirements call it themselves and update the target for
hooks to use.
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 8b38de2c..eb19cf20 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -41,7 +41,7 @@ const struct cmd_entry cmd_show_environment_entry = { .args = { "gst:", 0, 1 }, .usage = "[-gs] " CMD_TARGET_SESSION_USAGE " [name]", - .tflag = CMD_SESSION_CANFAIL, + .target = { 't', CMD_FIND_SESSION, CMD_FIND_CANFAIL }, .flags = CMD_AFTERHOOK, .exec = cmd_show_environment_exec @@ -97,7 +97,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item) const char *target; if ((target = args_get(args, 't')) != NULL) { - if (item->state.tflag.s == NULL) { + if (item->target.s == NULL) { cmdq_error(item, "no such session: %s", target); return (CMD_RETURN_ERROR); } @@ -106,7 +106,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item) if (args_has(self->args, 'g')) env = global_environ; else { - if (item->state.tflag.s == NULL) { + if (item->target.s == NULL) { target = args_get(args, 't'); if (target != NULL) cmdq_error(item, "no such session: %s", target); @@ -114,7 +114,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item) cmdq_error(item, "no current session"); return (CMD_RETURN_ERROR); } - env = item->state.tflag.s->environ; + env = item->target.s->environ; } if (args->argc != 0) { |