kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "main/config: Use ast_cli_completion_add for reload completion."

Browse Source
This commit is contained in:
Jenkins2
2018-03-20 08:20:54 -05:00
committed by Gerrit Code Review
parent bf9631ea0b 3ad56aa929
commit 716e2d46e7
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/config.c
View File

@@ -3930,8 +3930,8 @@ static char *handle_cli_core_show_config_mappings(struct ast_cli_entry *e, int c
static char *handle_cli_config_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_cli_config_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
struct cache_file_mtime *cfmtime; struct cache_file_mtime *cfmtime;
char *prev = "", *completion_value = NULL; char *prev = "";
int wordlen, which = 0; int wordlen;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
@@ -3949,19 +3949,20 @@ static char *handle_cli_config_reload(struct ast_cli_entry *e, int cmd, struct a
AST_LIST_LOCK(&cfmtime_head); AST_LIST_LOCK(&cfmtime_head);
AST_LIST_TRAVERSE(&cfmtime_head, cfmtime, list) { AST_LIST_TRAVERSE(&cfmtime_head, cfmtime, list) {
/* Skip duplicates - this only works because the list is sorted by filename */
if (strcmp(cfmtime->filename, prev) == 0) {
continue;
}
/* Core configs cannot be reloaded */ /* Core configs cannot be reloaded */
if (ast_strlen_zero(cfmtime->who_asked)) { if (ast_strlen_zero(cfmtime->who_asked)) {
continue; continue;
} }
if (++which > a->n && strncmp(cfmtime->filename, a->word, wordlen) == 0) { /* Skip duplicates - this only works because the list is sorted by filename */
completion_value = ast_strdup(cfmtime->filename); if (!strcmp(cfmtime->filename, prev)) {
break; continue;
}
if (!strncmp(cfmtime->filename, a->word, wordlen)) {
if (ast_cli_completion_add(ast_strdup(cfmtime->filename))) {
break;
}
} }
/* Otherwise save that we've seen this filename */ /* Otherwise save that we've seen this filename */
@@ -3969,7 +3970,7 @@ static char *handle_cli_config_reload(struct ast_cli_entry *e, int cmd, struct a
} }
AST_LIST_UNLOCK(&cfmtime_head); AST_LIST_UNLOCK(&cfmtime_head);
return completion_value; return NULL;
} }
if (a->argc != 3) { if (a->argc != 3) {