Mercurial > dovecot > core-2.2
changeset 19805:f569111ef855
doveadm-fetch: Use ver2 structures
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Wed, 17 Feb 2016 09:19:01 +0200 |
| parents | cffa74926d5b |
| children | c943b68cda91 |
| files | src/doveadm/doveadm-mail-fetch.c src/doveadm/doveadm-mail.c src/doveadm/doveadm-mail.h |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-fetch.c Mon Feb 22 18:20:59 2016 +0200 +++ b/src/doveadm/doveadm-mail-fetch.c Wed Feb 17 09:19:01 2016 +0200 @@ -605,6 +605,14 @@ return &ctx->ctx; } -struct doveadm_mail_cmd cmd_fetch = { - cmd_fetch_alloc, "fetch", "<fields> <search query>" +struct doveadm_cmd_ver2 doveadm_cmd_fetch_ver2 = { + .name = "fetch", + .mail_cmd = cmd_fetch_alloc, + .usage = "<fields> <search query>", +DOVEADM_CMD_PARAMS_START +DOVEADM_CMD_MAIL_COMMON +DOVEADM_CMD_PARAM('\0', "field", CMD_PARAM_ARRAY, 0) +DOVEADM_CMD_PARAM('\0', "fieldstr", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL | CMD_PARAM_FLAG_DO_NOT_EXPOSE) /* FIXME: horrible hack, remove me when possible */ +DOVEADM_CMD_PARAM('\0', "query", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAMS_END };
--- a/src/doveadm/doveadm-mail.c Mon Feb 22 18:20:59 2016 +0200 +++ b/src/doveadm/doveadm-mail.c Wed Feb 17 09:19:01 2016 +0200 @@ -817,7 +817,6 @@ &cmd_expunge, &cmd_save, &cmd_search, - &cmd_fetch, &cmd_flags_add, &cmd_flags_remove, &cmd_flags_replace, @@ -844,7 +843,8 @@ &doveadm_cmd_mailbox_delete_ver2, &doveadm_cmd_mailbox_rename_ver2, &doveadm_cmd_mailbox_subscribe_ver2, - &doveadm_cmd_mailbox_unsubscribe_ver2 + &doveadm_cmd_mailbox_unsubscribe_ver2, + &doveadm_cmd_fetch_ver2 }; void doveadm_mail_init(void)
--- a/src/doveadm/doveadm-mail.h Mon Feb 22 18:20:59 2016 +0200 +++ b/src/doveadm/doveadm-mail.h Wed Feb 17 09:19:01 2016 +0200 @@ -172,7 +172,6 @@ extern struct doveadm_mail_cmd cmd_expunge; extern struct doveadm_mail_cmd cmd_save; extern struct doveadm_mail_cmd cmd_search; -extern struct doveadm_mail_cmd cmd_fetch; extern struct doveadm_mail_cmd cmd_flags_add; extern struct doveadm_mail_cmd cmd_flags_remove; extern struct doveadm_mail_cmd cmd_flags_replace; @@ -195,6 +194,7 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_rename_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_subscribe_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_unsubscribe_ver2; +extern struct doveadm_cmd_ver2 doveadm_cmd_fetch_ver2; #define DOVEADM_CMD_MAIL_COMMON \ DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \