From 768dce24d41f51691d13328f21e52240257d4185 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sun, 13 Nov 2016 13:03:35 +0000 Subject: [PATCH] [Minor] Fix rspamc --commands --- src/client/rspamc.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/client/rspamc.c b/src/client/rspamc.c index 33d49345a..ea1003437 100644 --- a/src/client/rspamc.c +++ b/src/client/rspamc.c @@ -432,16 +432,31 @@ static void print_commands_list (void) { guint i; + guint cmd_len = 0; + gchar fmt_str[32]; rspamd_fprintf (stdout, "Rspamc commands summary:\n"); + + for (i = 0; i < G_N_ELEMENTS (rspamc_commands); i++) { + gsize clen = strlen (rspamc_commands[i].name); + + if (clen > cmd_len) { + cmd_len = clen; + } + } + + rspamd_snprintf (fmt_str, sizeof (fmt_str), " %%%ds (%%7s%%1s)\t%%s\n", + cmd_len); + for (i = 0; i < G_N_ELEMENTS (rspamc_commands); i++) { - rspamd_fprintf (stdout, - " %10s (%7s%1s)\t%s\n", - rspamc_commands[i].name, - rspamc_commands[i].is_controller ? "control" : "normal", - rspamc_commands[i].is_privileged ? "*" : "", - rspamc_commands[i].description); + fprintf (stdout, + fmt_str, + rspamc_commands[i].name, + rspamc_commands[i].is_controller ? "control" : "normal", + rspamc_commands[i].is_privileged ? "*" : "", + rspamc_commands[i].description); } + rspamd_fprintf (stdout, "\n* is for privileged commands that may need password (see -P option)\n"); rspamd_fprintf (stdout, -- 2.39.5