doveadm-copymove: Use ver2 structures

diff --git a/src/doveadm/doveadm-mail-copymove.c b/src/doveadm/doveadm-mail-copymove.c
index 19db4760c9caeff2d4bc4e7708bc4997fdb57a1d..0bfeb205cdfc4e8c1820d26cd024a5f6973dc643 100644 (file)
--- a/src/doveadm/doveadm-mail-copymove.c
+++ b/src/doveadm/doveadm-mail-copymove.c
@@ -191,9 +191,28 @@ static struct doveadm_mail_cmd_context *cmd_move_alloc(void)
        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
 };

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 30c1b4312fea95fd40ef9bb45b6cd7bb2ca20de7..bfc667f19ed2f379904b0516e19fa1eb964bcf65 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -834,8 +834,6 @@ DOVEADM_CMD_PARAMS_END
 
 
 static struct doveadm_mail_cmd *mail_commands[] = {
-       &cmd_copy,
-       &cmd_move,
        &cmd_batch,
        &cmd_dsync_backup,
        &cmd_dsync_mirror,
@@ -866,7 +864,9 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
        &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)

diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index 5153db3a4a05d680d2bec2c31f1f5a1679f19d32..c6368c8d1b4602c3944f6306f5e8ff01f5bbd6eb 100644 (file)
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -169,8 +169,6 @@ void doveadm_mail_failed_mailbox(struct doveadm_mail_cmd_context *ctx,
 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_remove_ver2;
 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) \