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-confirm-before.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-confirm-before.c')
| -rw-r--r-- | cmd-confirm-before.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c index e7366ec2..3042d066 100644 --- a/cmd-confirm-before.c +++ b/cmd-confirm-before.c @@ -41,8 +41,6 @@ const struct cmd_entry cmd_confirm_before_entry = { .args = { "p:t:", 1, 1 }, .usage = "[-p prompt] " CMD_TARGET_CLIENT_USAGE " command", - .tflag = CMD_CLIENT, - .flags = 0, .exec = cmd_confirm_before_exec }; @@ -57,10 +55,13 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; struct cmd_confirm_before_data *cdata; - struct client *c = item->state.c; + struct client *c; char *cmd, *copy, *new_prompt, *ptr; const char *prompt; + if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL) + return (CMD_RETURN_ERROR); + if ((prompt = args_get(args, 'p')) != NULL) xasprintf(&new_prompt, "%s ", prompt); else { |