kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "CLI: Fix remote console completion." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-12-07 14:19:53 -06:00
committed by Gerrit Code Review
parent 9bf73ae1b3 5a0dcd9275
commit ac7501b15c
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) static struct ast_vector_string *ast_el_strtoarr(char *buf)
{ {
char *retstr; char *retstr;
char *bestmatch;
struct ast_vector_string *vec = ast_calloc(1, sizeof(*vec)); struct ast_vector_string *vec = ast_calloc(1, sizeof(*vec));
if (!vec) { if (!vec) {
return NULL; 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, " "))) { while ((retstr = strsep(&buf, " "))) {
if (!strcmp(retstr, AST_CLI_COMPLETE_EOF)) { if (!strcmp(retstr, AST_CLI_COMPLETE_EOF)) {
break; break;
} }
/* Older daemons sent duplicates. */ /* Older daemons sent duplicates. */
if (AST_VECTOR_GET_CMP(vec, retstr, strcasecmp)) { if (AST_VECTOR_GET_CMP(vec, retstr, !strcasecmp)) {
continue; 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; goto vector_cleanup;
} }