doveadm-sieve: Update to ver2 structures

src/plugins/doveadm-sieve/doveadm-sieve-cmd-activate.c

@@ -125,12 +125,21 @@ cmd_sieve_deactivate_alloc(void)
 	return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd doveadm_sieve_cmd_activate = {
-	cmd_sieve_activate_alloc, "sieve activate", "<scriptname>"
+struct doveadm_cmd_ver2 doveadm_sieve_cmd_activate = {
+	.name = "sieve activate",
+	.mail_cmd = cmd_sieve_activate_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX"<scriptname>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0',"scriptname",CMD_PARAM_STR,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
 
-struct doveadm_mail_cmd doveadm_sieve_cmd_deactivate = {
-	cmd_sieve_deactivate_alloc, "sieve deactivate", NULL
+struct doveadm_cmd_ver2 doveadm_sieve_cmd_deactivate = {
+	.name = "sieve deactivate",
+	.mail_cmd = cmd_sieve_deactivate_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX,
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAMS_END
 };
-
-

src/plugins/doveadm-sieve/doveadm-sieve-cmd-delete.c

@@ -105,7 +105,13 @@ cmd_sieve_delete_alloc(void)
 	return &ctx->ctx.ctx;
 }
 
-struct doveadm_mail_cmd doveadm_sieve_cmd_delete = {
-	cmd_sieve_delete_alloc, "sieve delete", "[-a] <scriptname> [...]"
+struct doveadm_cmd_ver2 doveadm_sieve_cmd_put = {
+	.name = "sieve delete",
+	.mail_cmd = cmd_sieve_delete_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX"[-a] <scriptname> [...]",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('a',"ignore-active",CMD_PARAM_BOOL,0)
+DOVEADM_CMD_PARAM('\0',"scriptname",CMD_PARAM_ARRAY,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
-

src/plugins/doveadm-sieve/doveadm-sieve-cmd-get.c

@@ -69,7 +69,12 @@ cmd_sieve_get_alloc(void)
 	return &ctx->ctx.ctx;
 }
 
-struct doveadm_mail_cmd doveadm_sieve_cmd_get = {
-	cmd_sieve_get_alloc, "sieve get", "<scriptname>"
+struct doveadm_cmd_ver2 doveadm_sieve_cmd_get = {
+	.name = "sieve get",
+	.mail_cmd = cmd_sieve_get_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX"<scriptname>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0',"scriptname",CMD_PARAM_STR,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
-

src/plugins/doveadm-sieve/doveadm-sieve-cmd-list.c

@@ -68,7 +68,12 @@ cmd_sieve_list_alloc(void)
 	return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd doveadm_sieve_cmd_list = {
-	cmd_sieve_list_alloc, "sieve list", NULL
+struct doveadm_cmd_ver2 doveadm_sieve_cmd_list = {
+	.name = "sieve list",
+	.mail_cmd = cmd_sieve_list_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX,
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAMS_END
 };
 

src/plugins/doveadm-sieve/doveadm-sieve-cmd-put.c

@@ -174,7 +174,14 @@ cmd_sieve_put_alloc(void)
 	return &ctx->ctx.ctx;
 }
 
-struct doveadm_mail_cmd doveadm_sieve_cmd_put = {
-	cmd_sieve_put_alloc, "sieve put", "[-a] <scriptname>"
+struct doveadm_cmd_ver2 doveadm_sieve_cmd_put = {
+	.name = "sieve put",
+	.mail_cmd = cmd_sieve_put_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX"[-a] <scriptname>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('a',"activate",CMD_PARAM_BOOL,0)
+DOVEADM_CMD_PARAM('\0',"scriptname",CMD_PARAM_STR,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAM('\0',"file",CMD_PARAM_ISTREAM,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
-

src/plugins/doveadm-sieve/doveadm-sieve-cmd-rename.c

@@ -71,7 +71,13 @@ cmd_sieve_rename_alloc(void)
 	return &ctx->ctx.ctx;
 }
 
-struct doveadm_mail_cmd doveadm_sieve_cmd_rename = {
-	cmd_sieve_rename_alloc, "sieve rename", "<oldname> <newname>"
+struct doveadm_cmd_ver2 doveadm_sieve_cmd_rename = {
+	.name = "sieve rename",
+	.mail_cmd = cmd_sieve_rename_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX"<oldname> <newname>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0',"oldname",CMD_PARAM_STR,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAM('\0',"newname",CMD_PARAM_STR,CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
-

src/plugins/doveadm-sieve/doveadm-sieve-cmd.c

@@ -169,7 +169,7 @@ doveadm_sieve_cmd_alloc_size(size_t size)
 	return ctx;
 }
 
-static struct doveadm_mail_cmd *doveadm_sieve_commands[] = {
+static struct doveadm_cmd_ver2 *doveadm_sieve_commands[] = {
 	&doveadm_sieve_cmd_list,
 	&doveadm_sieve_cmd_get,
 	&doveadm_sieve_cmd_put,
@@ -184,5 +184,5 @@ void doveadm_sieve_cmds_init(void)
 	unsigned int i;
 
 	for (i = 0; i < N_ELEMENTS(doveadm_sieve_commands); i++)
-		doveadm_mail_register_cmd(doveadm_sieve_commands[i]);
+		doveadm_cmd_register_ver2(doveadm_sieve_commands[i]);
 }

src/plugins/doveadm-sieve/doveadm-sieve-cmd.h

@@ -35,13 +35,13 @@ doveadm_sieve_cmd_alloc_size(size_t size);
 
 void doveadm_sieve_cmd_scriptnames_check(const char *const args[]);
 
-extern struct doveadm_mail_cmd doveadm_sieve_cmd_list;
-extern struct doveadm_mail_cmd doveadm_sieve_cmd_get;
-extern struct doveadm_mail_cmd doveadm_sieve_cmd_put;
-extern struct doveadm_mail_cmd doveadm_sieve_cmd_delete;
-extern struct doveadm_mail_cmd doveadm_sieve_cmd_activate;
-extern struct doveadm_mail_cmd doveadm_sieve_cmd_deactivate;
-extern struct doveadm_mail_cmd doveadm_sieve_cmd_rename;
+extern struct doveadm_cmd_ver2 doveadm_sieve_cmd_list;
+extern struct doveadm_cmd_ver2 doveadm_sieve_cmd_get;
+extern struct doveadm_cmd_ver2 doveadm_sieve_cmd_put;
+extern struct doveadm_cmd_ver2 doveadm_sieve_cmd_delete;
+extern struct doveadm_cmd_ver2 doveadm_sieve_cmd_activate;
+extern struct doveadm_cmd_ver2 doveadm_sieve_cmd_deactivate;
+extern struct doveadm_cmd_ver2 doveadm_sieve_cmd_rename;
 
 void doveadm_sieve_cmds_init(void);