mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-15 19:42:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: cli: alphanumerically sort the dump of supported commands

Browse Source 
Like for previous keyword classes, we're sorting the output. But this
time as it's not trivial to do it with multiple words, instead we're
proceeding like the help command, we sort them on their usage message
when present, and fall back to the first word of the command when there
is no usage message (e.g. "help" command).
This commit is contained in:
Willy Tarreau
2022-03-30 12:02:35 +02:00
parent 800bd78944
commit 4465171593
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/cli.c
View File

@@ -372,24 +372,37 @@ void cli_register_kw(struct cli_kw_list *kw_list)
void cli_list_keywords(void)
{
struct cli_kw_list *kw_list;
struct cli_kw *kw;
struct cli_kw *kwp, *kwn, *kw;
int idx;
list_for_each_entry(kw_list, &cli_keywords.list, list) {
for (kw = &kw_list->kw[0]; kw->str_kw[0]; kw++) {
for (idx = 0; kw->str_kw[idx]; idx++) {
printf("%s ", kw->str_kw[idx]);
for (kwn = kwp = NULL;; kwp = kwn) {
list_for_each_entry(kw_list, &cli_keywords.list, list) {
/* note: we sort based on the usage message when available,
* otherwise we fall back to the first keyword.
*/
for (kw = &kw_list->kw[0]; kw->str_kw[0]; kw++) {
if (strordered(kwp ? kwp->usage ? kwp->usage : kwp->str_kw[0] : NULL,
kw->usage ? kw->usage : kw->str_kw[0],
kwn != kwp ? kwn->usage ? kwn->usage : kwn->str_kw[0] : NULL))
kwn = kw;
}
if (kw->level & (ACCESS_MASTER_ONLY|ACCESS_MASTER))
printf("[MASTER] ");
if (!(kw->level & ACCESS_MASTER_ONLY))
printf("[WORKER] ");
if (kw->level & ACCESS_EXPERT)
printf("[EXPERT] ");
if (kw->level & ACCESS_EXPERIMENTAL)
printf("[EXPERIM] ");
printf("\n");
}
if (kwn == kwp)
break;
for (idx = 0; kwn->str_kw[idx]; idx++) {
printf("%s ", kwn->str_kw[idx]);
}
if (kwn->level & (ACCESS_MASTER_ONLY|ACCESS_MASTER))
printf("[MASTER] ");
if (!(kwn->level & ACCESS_MASTER_ONLY))
printf("[WORKER] ");
if (kwn->level & ACCESS_EXPERT)
printf("[EXPERT] ");
if (kwn->level & ACCESS_EXPERIMENTAL)
printf("[EXPERIM] ");
printf("\n");
}
}