Mercurial > dovecot > core-2.2
changeset 19864:1d53dbca22da
doveadm-copymove: Use ver2 structures
author | Aki Tuomi <aki.tuomi@dovecot.fi> |
---|---|
date | Thu, 25 Feb 2016 09:26:39 +0200 |
parents | 516e7c50d32f |
children | 1fa82bbbb0fd |
files | src/doveadm/doveadm-mail-copymove.c src/doveadm/doveadm-mail.c src/doveadm/doveadm-mail.h |
diffstat | 3 files changed, 28 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-copymove.c Fri Feb 26 09:37:06 2016 +0200 +++ b/src/doveadm/doveadm-mail-copymove.c Thu Feb 25 09:26:39 2016 +0200 @@ -191,9 +191,28 @@ return &ctx->ctx; } -struct doveadm_mail_cmd cmd_copy = { - cmd_copy_alloc, "copy", "<destination> [user <source user>] <search query>" +struct doveadm_cmd_ver2 doveadm_cmd_copy_ver2 = { + .name = "copy", + .mail_cmd = cmd_copy_alloc, + .usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "<destination> [user <source user>] <search query>", +DOVEADM_CMD_PARAMS_START +DOVEADM_CMD_MAIL_COMMON +DOVEADM_CMD_PARAM('\0', "destination", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAM('\0', "source-type", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAM('\0', "source", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAM('\0', "query", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAMS_END }; -struct doveadm_mail_cmd cmd_move = { - cmd_move_alloc, "move", "<destination> [user <source user>] <search query>" + +struct doveadm_cmd_ver2 doveadm_cmd_move_ver2 = { + .name = "move", + .mail_cmd = cmd_move_alloc, + .usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "<destination> [user <source user>] <search query>", +DOVEADM_CMD_PARAMS_START +DOVEADM_CMD_MAIL_COMMON +DOVEADM_CMD_PARAM('\0', "destination", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAM('\0', "source-type", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAM('\0', "source", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAM('\0', "query", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAMS_END };
--- a/src/doveadm/doveadm-mail.c Fri Feb 26 09:37:06 2016 +0200 +++ b/src/doveadm/doveadm-mail.c Thu Feb 25 09:26:39 2016 +0200 @@ -834,8 +834,6 @@ static struct doveadm_mail_cmd *mail_commands[] = { - &cmd_copy, - &cmd_move, &cmd_batch, &cmd_dsync_backup, &cmd_dsync_mirror, @@ -866,7 +864,9 @@ &doveadm_cmd_import_ver2, &doveadm_cmd_force_resync_ver2, &doveadm_cmd_purge_ver2, - &doveadm_cmd_search_ver2 + &doveadm_cmd_search_ver2, + &doveadm_cmd_copy_ver2, + &doveadm_cmd_move_ver2 }; void doveadm_mail_init(void)
--- a/src/doveadm/doveadm-mail.h Fri Feb 26 09:37:06 2016 +0200 +++ b/src/doveadm/doveadm-mail.h Thu Feb 25 09:26:39 2016 +0200 @@ -169,8 +169,6 @@ void doveadm_mail_failed_list(struct doveadm_mail_cmd_context *ctx, struct mailbox_list *list); -extern struct doveadm_mail_cmd cmd_copy; -extern struct doveadm_mail_cmd cmd_move; extern struct doveadm_mail_cmd cmd_batch; extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_metadata_set_ver2; @@ -195,6 +193,8 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_flags_replace_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_import_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_search_ver2; +extern struct doveadm_cmd_ver2 doveadm_cmd_copy_ver2; +extern struct doveadm_cmd_ver2 doveadm_cmd_move_ver2; #define DOVEADM_CMD_MAIL_COMMON \ DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \