From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 19 Aug 2025 07:59:35 +0000 (+0300)
Subject: doveadm: Don't print duplicate sub-commands in help output
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;ds=inline;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Don't print duplicate sub-commands in help output

For example mailbox command output listed "cache|cache|..."
---

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 1f0743ae09..b1b3e78a10 100644
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -81,10 +81,11 @@ usage_commands_write(FILE *out, const ARRAY_TYPE(doveadm_cmd_ver2_p) *cmds,
 			if (strcmp(prev_name, short_name) != 0) {
 				if (*prev_name != '\0')
 					fprintf(out, "\n");
+				sub_name = t_strcut(p + 1, ' ');
 				fprintf(out, USAGE_CMDNAME_FMT" %s",
-					short_name, t_strcut(p + 1, ' '));
+					short_name, sub_name);
 				prev_name = short_name;
-				prev_sub_name = "";
+				prev_sub_name = sub_name;
 			} else {
 				sub_name = t_strcut(p + 1, ' ');
 				if (strcmp(prev_sub_name, sub_name) != 0) {