From: Timo Sirainen <tss@iki.fi>
Date: Wed, 24 Nov 2010 18:56:48 +0000 (+0000)
Subject: doveadm: -s was already used by some mailbox commands, renamed to -S.
X-Git-Tag: 2.0.8~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bce86e7b76eece615398c1a4c47b84440afd663;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: -s was already used by some mailbox commands, renamed to -S.
Also added -S to usage output.
---

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index ed97191727..3d51c50faf 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -380,7 +380,7 @@ doveadm_mail_cmd(const struct doveadm_mail_cmd *cmd, int argc, char *argv[])
 		case 'A':
 			ctx->iterate_all_users = TRUE;
 			break;
-		case 's':
+		case 'S':
 			doveadm_settings->doveadm_socket_path = optarg;
 			if (doveadm_settings->doveadm_worker_count == 0)
 				doveadm_settings->doveadm_worker_count = 1;
@@ -504,7 +504,8 @@ void doveadm_mail_usage(string_t *out)
 	const struct doveadm_mail_cmd *cmd;
 
 	array_foreach(&doveadm_mail_cmds, cmd) {
-		str_printfa(out, "%s\t[-u <user>|-A]", cmd->name);
+		str_printfa(out, "%s\t[-u <user>|-A] [-S <socket_path>]",
+			    cmd->name);
 		if (cmd->usage_args != NULL)
 			str_printfa(out, " %s", cmd->usage_args);
 		str_append_c(out, '\n');
@@ -513,8 +514,8 @@ void doveadm_mail_usage(string_t *out)
 
 void doveadm_mail_help(const struct doveadm_mail_cmd *cmd)
 {
-	fprintf(stderr, "doveadm %s [-u <user>|-A] %s\n", cmd->name,
-		cmd->usage_args == NULL ? "" : cmd->usage_args);
+	fprintf(stderr, "doveadm %s [-u <user>|-A] [-S <socket_path>] %s\n",
+		cmd->name, cmd->usage_args == NULL ? "" : cmd->usage_args);
 	exit(1);
 }