doveadm batch: Convert to v2 command

diff --git a/src/doveadm/doveadm-mail-batch.c b/src/doveadm/doveadm-mail-batch.c
index b9eb909329cb35905c956148a2578ec736e0726b..f892e797b84bae5de7fd4c3c24a804f1a6011125 100644 (file)
--- a/src/doveadm/doveadm-mail-batch.c
+++ b/src/doveadm/doveadm-mail-batch.c
@@ -173,6 +173,14 @@ static struct doveadm_mail_cmd_context *cmd_batch_alloc(void)
        return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd cmd_batch = {
-       cmd_batch_alloc, "batch", "<sep> <cmd1> [<sep> <cmd2> [..]]"
+struct doveadm_cmd_ver2 doveadm_cmd_batch = {
+       .name = "batch",
+       .mail_cmd = cmd_batch_alloc,
+       .usage = "<sep> <cmd1> [<sep> <cmd2> [..]]",
+       .flags = CMD_FLAG_NO_UNORDERED_OPTIONS,
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0', "separator", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAM('\0', "args", 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 23d845b6ce97326000db871ee68f4756d4bc8ef2..f67b2ac5e76c2147376236a060ae3dee72394ba4 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -915,13 +915,13 @@ DOVEADM_CMD_PARAMS_END
 
 
 static struct doveadm_mail_cmd *mail_commands[] = {
-       &cmd_batch,
        &cmd_dsync_backup,
        &cmd_dsync_mirror,
        &cmd_dsync_server
 };
 
 static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
+       &doveadm_cmd_batch,
        &doveadm_cmd_mailbox_metadata_set_ver2,
        &doveadm_cmd_mailbox_metadata_unset_ver2,
        &doveadm_cmd_mailbox_metadata_get_ver2,

diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index cc64c936cc0d024760c2a8b9af31a4f426bebe80..ef726f3393b2a074e24af965f811441e1d06cac1 100644 (file)
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -170,8 +170,7 @@ 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_batch;
-
+extern struct doveadm_cmd_ver2 doveadm_cmd_batch;
 extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_metadata_set_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_metadata_unset_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_metadata_get_ver2;