Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "manager: Use ast_cli_completion_add for completion generators."

Browse Source
16.0
Joshua Colp 7 years ago committed by Gerrit Code Review
parent e3a5874c12 8d01ec572d
commit 1a2f12e288
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File

46
main/manager.c
Unescape View File

@ -2325,9 +2325,9 @@ static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_
{ {
struct manager_action *cur; struct manager_action *cur;
struct ast_str *authority; struct ast_str *authority;
int num, l, which; int num;
int l;
const char *auth_str; const char *auth_str;
char *ret = NULL;
#ifdef AST_XML_DOCS #ifdef AST_XML_DOCS
char syntax_title[64], description_title[64], synopsis_title[64], seealso_title[64]; char syntax_title[64], description_title[64], synopsis_title[64], seealso_title[64];
char arguments_title[64], privilege_title[64], final_response_title[64], list_responses_title[64]; char arguments_title[64], privilege_title[64], final_response_title[64], list_responses_title[64];
@ -2342,16 +2342,16 @@ static char *handle_showmancmd(struct ast_cli_entry *e, int cmd, struct ast_cli_
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
l = strlen(a->word); l = strlen(a->word);
which = 0;
AST_RWLIST_RDLOCK(&actions); AST_RWLIST_RDLOCK(&actions);
AST_RWLIST_TRAVERSE(&actions, cur, list) { AST_RWLIST_TRAVERSE(&actions, cur, list) {
if (!strncasecmp(a->word, cur->action, l) && ++which > a->n) { if (!strncasecmp(a->word, cur->action, l)) {
ret = ast_strdup(cur->action); if (ast_cli_completion_add(ast_strdup(cur->action))) {
break; /* make sure we exit even if ast_strdup() returns NULL */ break;
}
} }
} }
AST_RWLIST_UNLOCK(&actions); AST_RWLIST_UNLOCK(&actions);
return ret; return NULL;
} }
if (a->argc < 4) { if (a->argc < 4) {
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
@ -2481,8 +2481,7 @@ static char *handle_mandebug(struct ast_cli_entry *e, int cmd, struct ast_cli_ar
static char *handle_showmanager(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_showmanager(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
struct ast_manager_user *user = NULL; struct ast_manager_user *user = NULL;
int l, which; int l;
char *ret = NULL;
struct ast_str *rauthority = ast_str_alloca(MAX_AUTH_PERM_STRING); struct ast_str *rauthority = ast_str_alloca(MAX_AUTH_PERM_STRING);
struct ast_str *wauthority = ast_str_alloca(MAX_AUTH_PERM_STRING); struct ast_str *wauthority = ast_str_alloca(MAX_AUTH_PERM_STRING);
struct ast_variable *v; struct ast_variable *v;
@ -2496,19 +2495,19 @@ static char *handle_showmanager(struct ast_cli_entry *e, int cmd, struct ast_cli
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
l = strlen(a->word); l = strlen(a->word);
which = 0;
if (a->pos != 3) { if (a->pos != 3) {
return NULL; return NULL;
} }
AST_RWLIST_RDLOCK(&users); AST_RWLIST_RDLOCK(&users);
AST_RWLIST_TRAVERSE(&users, user, list) { AST_RWLIST_TRAVERSE(&users, user, list) {
if ( !strncasecmp(a->word, user->username, l) && ++which > a->n ) { if (!strncasecmp(a->word, user->username, l)) {
ret = ast_strdup(user->username); if (ast_cli_completion_add(ast_strdup(user->username))) {
break; break;
}
} }
} }
AST_RWLIST_UNLOCK(&users); AST_RWLIST_UNLOCK(&users);
return ret; return NULL;
} }
if (a->argc != 4) { if (a->argc != 4) {
@ -8645,8 +8644,6 @@ static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct
struct ao2_iterator it_events; struct ao2_iterator it_events;
struct ast_xml_doc_item *item, *temp; struct ast_xml_doc_item *item, *temp;
int length; int length;
int which;
char *match = NULL;
if (cmd == CLI_INIT) { if (cmd == CLI_INIT) {
e->command = "manager show event"; e->command = "manager show event";
@ -8663,19 +8660,24 @@ static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct
} }
if (cmd == CLI_GENERATE) { if (cmd == CLI_GENERATE) {
if (a->pos != 3) {
return NULL;
}
length = strlen(a->word); length = strlen(a->word);
which = 0;
it_events = ao2_iterator_init(events, 0); it_events = ao2_iterator_init(events, 0);
while ((item = ao2_iterator_next(&it_events))) { while ((item = ao2_iterator_next(&it_events))) {
if (!strncasecmp(a->word, item->name, length) && ++which > a->n) { if (!strncasecmp(a->word, item->name, length)) {
match = ast_strdup(item->name); if (ast_cli_completion_add(ast_strdup(item->name))) {
ao2_ref(item, -1); ao2_ref(item, -1);
break; break;
}
} }
ao2_ref(item, -1); ao2_ref(item, -1);
} }
ao2_iterator_destroy(&it_events); ao2_iterator_destroy(&it_events);
return match;
return NULL;
} }
if (a->argc != 4) { if (a->argc != 4) {

Write Preview
Loading…
Cancel
Save