doveadm-save: Use ver2 command structure

diff --git a/src/doveadm/doveadm-mail-save.c b/src/doveadm/doveadm-mail-save.c
index 8b840cb6a6f28ffb6f3a2df2aa7c395c89e7d1a8..64a742fc836b53eb6cea8d1cbf59123c21b5dc68 100644 (file)
--- 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 ee2fcd80cf86db328d44bc65910466e8f66d90f8..1b34e5fff47399db858836ed012969c51a45bb60 100644 (file)
--- 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 bcc88426d376139b93688195574a6703297df461..c4f4b2a7eb128271cf7607ba90c4ee2585d8b8e5 100644 (file)
--- 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) \