doveadm-expunge: Use ver2 structures

diff --git a/src/doveadm/doveadm-mail-expunge.c b/src/doveadm/doveadm-mail-expunge.c
index f81fbbeda34524aca45f193deeba6a7c45fa618f..3703739df7882e57e2a2f745a2328d066c4bd4f8 100644 (file)
--- a/src/doveadm/doveadm-mail-expunge.c
+++ b/src/doveadm/doveadm-mail-expunge.c
@@ -274,6 +274,13 @@ static struct doveadm_mail_cmd_context *cmd_expunge_alloc(void)
        return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd cmd_expunge = {
-       cmd_expunge_alloc, "expunge", "[-d] <search query>"
+struct doveadm_cmd_ver2 doveadm_cmd_expunge_ver2 = {
+       .name = "expunge",
+       .mail_cmd = cmd_expunge_alloc,
+       .usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[-m] <search query>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('d', "delete-empty-mailbox", CMD_PARAM_BOOL, 0)
+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 05f22d0e7c2e973576e264263560298057919ef5..84ff4e3c2258fc8b8732eea8d9afe458d3ccfca8 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -823,7 +823,6 @@ static struct doveadm_mail_cmd cmd_purge = {
 static struct doveadm_mail_cmd *mail_commands[] = {
        &cmd_force_resync,
        &cmd_purge,
-       &cmd_expunge,
        &cmd_search,
        &cmd_flags_add,
        &cmd_flags_remove,
@@ -853,7 +852,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
        &doveadm_cmd_save_ver2,
        &doveadm_cmd_index_ver2,
        &doveadm_cmd_altmove_ver2,
-       &doveadm_cmd_deduplicate_ver2
+       &doveadm_cmd_deduplicate_ver2,
+       &doveadm_cmd_expunge_ver2
 };
 
 void doveadm_mail_init(void)

diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index 30c0fdff56efd100bfb01e55913263e901ebe887..fc6958dab29a66b8307fc449e384ba2bbe9edd66 100644 (file)
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -169,7 +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_expunge;
 extern struct doveadm_mail_cmd cmd_search;
 extern struct doveadm_mail_cmd cmd_flags_add;
 extern struct doveadm_mail_cmd cmd_flags_remove;
@@ -195,6 +194,7 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_save_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_index_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_altmove_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_deduplicate_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_expunge_ver2;
 
 #define DOVEADM_CMD_MAIL_COMMON \
 DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \