From b6c6b081cb4258d5e1bf1587046ba02fe8d180f0 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 20 Oct 2016 13:11:19 +0300 Subject: [PATCH] doveadm service stop: Convert to doveadm v2 API --- src/doveadm/doveadm-master.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/doveadm/doveadm-master.c b/src/doveadm/doveadm-master.c index ba3a1565e3..fc75014b7d 100644 --- a/src/doveadm/doveadm-master.c +++ b/src/doveadm/doveadm-master.c @@ -104,18 +104,18 @@ static struct istream *master_service_send_cmd(const char *cmd) return i_stream_create_fd_autoclose(&fd, IO_BLOCK_SIZE); } -static void cmd_service_stop(int argc, char *argv[]) +static void cmd_service_stop(struct doveadm_cmd_context *cctx) { - const char *line; + const char *line, *const *services; - if (argc == 1) - help_ver2(&doveadm_cmd_service_stop_ver2); + if (!doveadm_cmd_param_array(cctx, "service", &services)) + i_fatal("service parameter missing"); string_t *cmd = t_str_new(128); str_append(cmd, "STOP"); - for (int i = 1; i < argc; i++) { + for (unsigned int i = 0; services[i] != NULL; i++) { str_append_c(cmd, '\t'); - str_append(cmd, argv[i]); + str_append(cmd, services[i]); } struct istream *input = master_service_send_cmd(str_c(cmd)); @@ -154,7 +154,7 @@ DOVEADM_CMD_PARAMS_END }; struct doveadm_cmd_ver2 doveadm_cmd_service_stop_ver2 = { - .old_cmd = cmd_service_stop, + .cmd = cmd_service_stop, .name = "service stop", .usage = " [ [...]]", DOVEADM_CMD_PARAMS_START