From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 25 Feb 2016 07:39:55 +0000 (+0200)
Subject: doveadm-expunge: Use ver2 structures
X-Git-Tag: 2.2.22.rc1~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=977f08d645b1779527c0938bbb848b61064839c3;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-expunge: Use ver2 structures
---

diff --git a/src/doveadm/doveadm-mail-expunge.c b/src/doveadm/doveadm-mail-expunge.c
index f81fbbeda3..3703739df7 100644
--- 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 05f22d0e7c..84ff4e3c22 100644
--- 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 30c0fdff56..fc6958dab2 100644
--- 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) \