From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 17 Feb 2016 08:24:24 +0000 (+0200)
Subject: doveadm-save: Use ver2 command structure
X-Git-Tag: 2.2.22.rc1~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ba6009f4e5493c4e6be9ffb3134525004a7975c;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-save: Use ver2 command structure
---

diff --git a/src/doveadm/doveadm-mail-save.c b/src/doveadm/doveadm-mail-save.c
index 8b840cb6a6..64a742fc83 100644
--- a/src/doveadm/doveadm-mail-save.c
+++ b/src/doveadm/doveadm-mail-save.c
@@ -121,3 +121,14 @@ static struct doveadm_mail_cmd_context *cmd_save_alloc(void)
 struct doveadm_mail_cmd cmd_save = {
 	cmd_save_alloc, "save", "[-m mailbox]"
 };
+
+struct doveadm_cmd_ver2 doveadm_cmd_save_ver2 = {
+	.name = "save",
+	.usage = "[-m mailbox]",
+	.mail_cmd = cmd_save_alloc,
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('m', "mailbox", CMD_PARAM_STR, 0)
+DOVEADM_CMD_PARAM('\0', "file", CMD_PARAM_ISTREAM, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
+};
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index ee2fcd80cf..1b34e5fff4 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -820,7 +820,6 @@ static struct doveadm_mail_cmd *mail_commands[] = {
 	&cmd_force_resync,
 	&cmd_purge,
 	&cmd_expunge,
-	&cmd_save,
 	&cmd_search,
 	&cmd_flags_add,
 	&cmd_flags_remove,
@@ -849,7 +848,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
 	&doveadm_cmd_mailbox_rename_ver2,
 	&doveadm_cmd_mailbox_subscribe_ver2,
 	&doveadm_cmd_mailbox_unsubscribe_ver2,
-	&doveadm_cmd_fetch_ver2
+	&doveadm_cmd_fetch_ver2,
+	&doveadm_cmd_save_ver2
 };
 
 void doveadm_mail_init(void)
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index bcc88426d3..c4f4b2a7eb 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -170,7 +170,6 @@ 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_save;
 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_mailbox_rename_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_subscribe_ver2;
 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;
 
 #define DOVEADM_CMD_MAIL_COMMON \
 DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \