doveadm-index: Use ver2 structures

diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c
index b79ed8759773e5153782306ae54161f79d2987ea..46d5e8c96a9a634f79d16dd5c9d401c237098987 100644 (file)
--- a/src/doveadm/doveadm-mail-index.c
+++ b/src/doveadm/doveadm-mail-index.c
@@ -274,6 +274,14 @@ static struct doveadm_mail_cmd_context *cmd_index_alloc(void)
        return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd cmd_index = {
-       cmd_index_alloc, "index", "[-q] [-n <max recent>] <mailbox mask>"
+struct doveadm_cmd_ver2 doveadm_cmd_index_ver2 = {
+       .name = "index",
+       .usage = "[-q] [-n <max recent>] <mailbox mask>",
+       .mail_cmd = cmd_index_alloc,
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('q',"queue",CMD_PARAM_BOOL,0)
+DOVEADM_CMD_PARAM('n',"max-recent",CMD_PARAM_STR,0)
+DOVEADM_CMD_PARAM('\0',"mailbox-mask",CMD_PARAM_STR,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 1b34e5fff47399db858836ed012969c51a45bb60..ecd3164debe211905c298949f5f8ac8d0e6b7267 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -825,7 +825,6 @@ static struct doveadm_mail_cmd *mail_commands[] = {
        &cmd_flags_remove,
        &cmd_flags_replace,
        &cmd_import,
-       &cmd_index,
        &cmd_altmove,
        &cmd_copy,
        &cmd_deduplicate,
@@ -849,7 +848,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
        &doveadm_cmd_mailbox_subscribe_ver2,
        &doveadm_cmd_mailbox_unsubscribe_ver2,
        &doveadm_cmd_fetch_ver2,
-       &doveadm_cmd_save_ver2
+       &doveadm_cmd_save_ver2,
+       &doveadm_cmd_index_ver2
 };
 
 void doveadm_mail_init(void)

diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index c4f4b2a7eb128271cf7607ba90c4ee2585d8b8e5..4d8a1125b387e19910eb99c98e8e4ee70f5b55a5 100644 (file)
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -175,7 +175,6 @@ extern struct doveadm_mail_cmd cmd_flags_add;
 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_index;
 extern struct doveadm_mail_cmd cmd_altmove;
 extern struct doveadm_mail_cmd cmd_copy;
 extern struct doveadm_mail_cmd cmd_deduplicate;
@@ -195,6 +194,7 @@ 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;
+extern struct doveadm_cmd_ver2 doveadm_cmd_index_ver2;
 
 #define DOVEADM_CMD_MAIL_COMMON \
 DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \