kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-07 05:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Refactor ast_cli_display_match_list.

Browse Source 
* Stop estimating line count, just print until we run out of matches.
* Stop freeing entries, the caller does that anyways.
* Stop calculating / returning numoutput, it was ignored.

Change-Id: I7f92afa8bea92241a95227587367424c8c32a5cb
This commit is contained in:
Corey Farrell
2017-11-07 15:47:51 -05:00
parent 0fd8db7ec2
commit e07d94111d
1 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
main/asterisk.c
View File

@@ -3200,51 +3200,37 @@ static int ast_el_sort_compare(const void *i1, const void *i2)
return strcasecmp(s1, s2); return strcasecmp(s1, s2);
} }
static int ast_cli_display_match_list(char **matches, int len, int max) static void ast_cli_display_match_list(char **matches, int len, int max)
{ {
int i, idx, limit, count; int idx = 1;
int screenwidth = 0;
int numoutput = 0, numoutputline = 0;
screenwidth = ast_get_termcols(STDOUT_FILENO);
/* find out how many entries can be put on one line, with two spaces between strings */ /* find out how many entries can be put on one line, with two spaces between strings */
limit = screenwidth / (max + 2); int limit = ast_get_termcols(STDOUT_FILENO) / (max + 2);
if (limit == 0)
if (limit == 0) {
limit = 1; limit = 1;
}
/* how many lines of output */
count = len / limit;
if (count * limit < len)
count++;
idx = 1;
qsort(&matches[0], (size_t)(len), sizeof(char *), ast_el_sort_compare); qsort(&matches[0], (size_t)(len), sizeof(char *), ast_el_sort_compare);
for (; count > 0; count--) { for (;;) {
numoutputline = 0; int numoutputline;
for (i = 0; i < limit && matches[idx]; i++, idx++) {
for (numoutputline = 0; numoutputline < limit && matches[idx]; idx++) {
/* Don't print dupes */ /* Don't print dupes */
if ( (matches[idx+1] != NULL && strcmp(matches[idx], matches[idx+1]) == 0 ) ) { if ( (matches[idx+1] != NULL && strcmp(matches[idx], matches[idx+1]) == 0 ) ) {
i--;
ast_free(matches[idx]);
matches[idx] = NULL;
continue; continue;
} }
numoutput++;
numoutputline++; numoutputline++;
fprintf(stdout, "%-*s ", max, matches[idx]); fprintf(stdout, "%-*s ", max, matches[idx]);
ast_free(matches[idx]);
matches[idx] = NULL;
} }
if (numoutputline > 0)
fprintf(stdout, "\n");
}
return numoutput; if (!numoutputline) {
break;
}
fprintf(stdout, "\n");
}
} }