doveadm-import: Use ver2 structures

diff --git a/src/doveadm/doveadm-mail-import.c b/src/doveadm/doveadm-mail-import.c
index f0a03688a512a21ca899445c0b963c202729ac8c..3cbb3b76fda36a5edf0e920da9b6c75b64376ecd 100644 (file)
--- 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 3001dc0f4826a4bc48b7be5d9bcc0074c65de22a..3640f77d0bd1b1daf0bd71a6f0236aded82493b0 100644 (file)
--- 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 89144aff5afe634b3e54a3095fbe3e6125a63a2b..cb9a197b6dbd653930b91c95ed9608c076b22e7f 100644 (file)
--- 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) \