diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 16:26:47 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 16:26:47 +0000 |
| commit | 9b0ed01cdcbd67de4a2c46ebc7fd5faf0a6958cf (patch) | |
| tree | deda922dab8699d31ee69845df1b1f731975e555 /main/cli.c | |
| parent | 9e70dc3fcbf37861480d7f6ef19b09ef17e8dd65 (diff) | |
Merged revisions 47375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47375 | russell | 2006-11-09 11:24:02 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix "core show channel". Also, fix tab completion for both "core show channel"
and "core show channels".
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47376 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cli.c')
| -rw-r--r-- | main/cli.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/main/cli.c b/main/cli.c index ae6339e42..fa6a78909 100644 --- a/main/cli.c +++ b/main/cli.c @@ -727,12 +727,12 @@ static int handle_showchan(int fd, int argc, char *argv[]) long elapsed_seconds=0; int hour=0, min=0, sec=0; - if (argc != 3) + if (argc != 4) return RESULT_SHOWUSAGE; now = ast_tvnow(); - c = ast_get_channel_by_name_locked(argv[2]); + c = ast_get_channel_by_name_locked(argv[3]); if (!c) { - ast_cli(fd, "%s is not a known channel\n", argv[2]); + ast_cli(fd, "%s is not a known channel\n", argv[3]); return RESULT_SUCCESS; } if(c->cdr) { @@ -821,7 +821,7 @@ static char *complete_show_channels(const char *line, const char *word, int pos, { static char *choices[] = { "concise", "verbose", NULL }; - return (pos != 2) ? NULL : ast_cli_complete(word, choices, state); + return (pos != 3) ? NULL : ast_cli_complete(word, choices, state); } char *ast_complete_channels(const char *line, const char *word, int pos, int state, int rpos) @@ -850,6 +850,11 @@ static char *complete_ch_3(const char *line, const char *word, int pos, int stat return ast_complete_channels(line, word, pos, state, 2); } +static char *complete_ch_4(const char *line, const char *word, int pos, int state) +{ + return ast_complete_channels(line, word, pos, state, 3); +} + static char *complete_mod_3_nr(const char *line, const char *word, int pos, int state) { return ast_module_helper(line, word, pos, state, 2, 0); @@ -977,7 +982,7 @@ static struct ast_cli_entry cli_cli[] = { { { "core", "show" "channel", NULL }, handle_showchan, "Display information on a specific channel", - showchan_help, complete_ch_3 }, + showchan_help, complete_ch_4 }, { { "core", "debug", "channel", NULL }, handle_debugchan, "Enable debugging on a channel", |