changeset 19849:8bd17b549c71

doveadm-altmove: Use ver2 structures
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Thu, 25 Feb 2016 09:08:38 +0200
parents 15aad2074946
children aae882c92d77
files src/doveadm/doveadm-mail-altmove.c src/doveadm/doveadm-mail.c src/doveadm/doveadm-mail.h
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-altmove.c	Wed Feb 24 11:19:11 2016 +0200
+++ b/src/doveadm/doveadm-mail-altmove.c	Thu Feb 25 09:08:38 2016 +0200
@@ -150,6 +150,13 @@
 	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
 };
--- a/src/doveadm/doveadm-mail.c	Wed Feb 24 11:19:11 2016 +0200
+++ b/src/doveadm/doveadm-mail.c	Thu Feb 25 09:08:38 2016 +0200
@@ -829,7 +829,6 @@
 	&cmd_flags_remove,
 	&cmd_flags_replace,
 	&cmd_import,
-	&cmd_altmove,
 	&cmd_copy,
 	&cmd_deduplicate,
 	&cmd_move,
@@ -853,7 +852,8 @@
 	&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)
--- a/src/doveadm/doveadm-mail.h	Wed Feb 24 11:19:11 2016 +0200
+++ b/src/doveadm/doveadm-mail.h	Thu Feb 25 09:08:38 2016 +0200
@@ -175,7 +175,6 @@
 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_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) \