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 1f0743ae09e6127f9ddc3f72c076a562ce7a33f7..b1b3e78a10d22bac627836338bc2b45b9ca52d98 100644 (file)
--- 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");
                        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",
                                fprintf(out, USAGE_CMDNAME_FMT" %s",

-                                       short_name, t_strcut(p + 1, ' '));
+                                       short_name, sub_name);

                                prev_name = short_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) {
                        } else {
                                sub_name = t_strcut(p + 1, ' ');
                                if (strcmp(prev_sub_name, sub_name) != 0) {