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

doveadm-altmove: Use ver2 structures
---

diff --git a/src/doveadm/doveadm-mail-altmove.c b/src/doveadm/doveadm-mail-altmove.c
index a7630afce7..1fd327bc17 100644
--- a/src/doveadm/doveadm-mail-altmove.c
+++ b/src/doveadm/doveadm-mail-altmove.c
@@ -150,6 +150,13 @@ static struct doveadm_mail_cmd_context *cmd_altmove_alloc(void)
 	return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd cmd_altmove = {
-	cmd_altmove_alloc, "altmove", "[-r] <search query>"
+struct doveadm_cmd_ver2 doveadm_cmd_altmove_ver2 = {
+	.name = "altmove",
+	.mail_cmd = cmd_altmove_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[-r] <search query>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('r', "reverse", 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 3cd8d83ab7..ee155acb6e 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -829,7 +829,6 @@ static struct doveadm_mail_cmd *mail_commands[] = {
 	&cmd_flags_remove,
 	&cmd_flags_replace,
 	&cmd_import,
-	&cmd_altmove,
 	&cmd_copy,
 	&cmd_deduplicate,
 	&cmd_move,
@@ -853,7 +852,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
 	&doveadm_cmd_mailbox_unsubscribe_ver2,
 	&doveadm_cmd_fetch_ver2,
 	&doveadm_cmd_save_ver2,
-	&doveadm_cmd_index_ver2
+	&doveadm_cmd_index_ver2,
+	&doveadm_cmd_altmove_ver2
 };
 
 void doveadm_mail_init(void)
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index a52a573e2c..e6eec3ff02 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -175,7 +175,6 @@ extern struct doveadm_mail_cmd cmd_flags_add;
 extern struct doveadm_mail_cmd cmd_flags_remove;
 extern struct doveadm_mail_cmd cmd_flags_replace;
 extern struct doveadm_mail_cmd cmd_import;
-extern struct doveadm_mail_cmd cmd_altmove;
 extern struct doveadm_mail_cmd cmd_copy;
 extern struct doveadm_mail_cmd cmd_deduplicate;
 extern struct doveadm_mail_cmd cmd_move;
@@ -195,6 +194,7 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_unsubscribe_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_fetch_ver2;
 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;
 
 #define DOVEADM_CMD_MAIL_COMMON \
 DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \