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

CLI: Fix remote console completion.

Browse Source 
Duplicate checking was done incorrectly when parsing completion options
from a remote console causing all options to be ignored as duplicates.
Once fixed I had to separate processing of the best match to ensure it
was not identified as a duplicate when it is the only match.

ASTERISK-27465

Change-Id: Ibbdb29f88211742071836c9b3f4d2aa1221cd0f9
This commit is contained in:
Corey Farrell
2017-12-07 11:35:39 -05:00
parent 93859f9aca
commit 5a0dcd9275
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/asterisk.c
View File

@@ -3133,19 +3133,26 @@ static char *cli_prompt(EditLine *editline)
static struct ast_vector_string *ast_el_strtoarr(char *buf)
{
char *retstr;
char *bestmatch;
struct ast_vector_string *vec = ast_calloc(1, sizeof(*vec));
if (!vec) {
return NULL;
}
/* bestmatch must not be deduplicated */
bestmatch = strsep(&buf, " ");
if (!bestmatch || !strcmp(bestmatch, AST_CLI_COMPLETE_EOF)) {
goto vector_cleanup;
}
while ((retstr = strsep(&buf, " "))) {
if (!strcmp(retstr, AST_CLI_COMPLETE_EOF)) {
break;
}
/* Older daemons sent duplicates. */
if (AST_VECTOR_GET_CMP(vec, retstr, strcasecmp)) {
if (AST_VECTOR_GET_CMP(vec, retstr, !strcasecmp)) {
continue;
}
@@ -3157,7 +3164,9 @@ static struct ast_vector_string *ast_el_strtoarr(char *buf)
}
}
if (!AST_VECTOR_SIZE(vec)) {
bestmatch = ast_strdup(bestmatch);
if (!bestmatch || AST_VECTOR_INSERT_AT(vec, 0, bestmatch)) {
ast_free(bestmatch);
goto vector_cleanup;
}