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

doveadm-import: Use ver2 structures
---

diff --git a/src/doveadm/doveadm-mail-import.c b/src/doveadm/doveadm-mail-import.c
index f0a03688a5..3cbb3b76fd 100644
--- a/src/doveadm/doveadm-mail-import.c
+++ b/src/doveadm/doveadm-mail-import.c
@@ -249,7 +249,15 @@ static struct doveadm_mail_cmd_context *cmd_import_alloc(void)
 	return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd cmd_import = {
-	cmd_import_alloc, "import",
-	"[-s] <source mail location> <dest parent mailbox> <search query>"
+struct doveadm_cmd_ver2 doveadm_cmd_import_ver2 = {
+	.name = "import",
+	.mail_cmd = cmd_import_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[-s] <source mail location> <dest parent mailbox> <search query>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('s', "subscribe", CMD_PARAM_BOOL, 0)
+DOVEADM_CMD_PARAM('\0', "source-location", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAM('\0', "dest-parent-mailbox", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+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 3001dc0f48..3640f77d0b 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -824,7 +824,6 @@ static struct doveadm_mail_cmd *mail_commands[] = {
 	&cmd_force_resync,
 	&cmd_purge,
 	&cmd_search,
-	&cmd_import,
 	&cmd_copy,
 	&cmd_move,
 	&cmd_batch,
@@ -853,7 +852,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
 	&doveadm_cmd_expunge_ver2,
 	&doveadm_cmd_flags_add_ver2,
 	&doveadm_cmd_flags_remove_ver2,
-	&doveadm_cmd_flags_replace_ver2
+	&doveadm_cmd_flags_replace_ver2,
+	&doveadm_cmd_import_ver2
 };
 
 void doveadm_mail_init(void)
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index 89144aff5a..cb9a197b6d 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -195,6 +195,7 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_expunge_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_flags_add_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_flags_remove_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_flags_replace_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_import_ver2;
 
 #define DOVEADM_CMD_MAIL_COMMON \
 DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \