kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the regexp cli support on some of the command

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-11-17 11:15:54 +00:00
parent 867e3d6e5d
commit 779f4c0e0a
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channels/chan_oss.c
View File

@@ -1065,11 +1065,10 @@ static struct ast_channel *oss_request(const char *type, int format, void *data,
static char *console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct chan_oss_pvt *o = find_desc(oss_active);
static char *choices[] = { "on", "off", NULL };
switch (cmd) {
case CLI_INIT:
e->command = "console autoanswer";
e->command = "console autoanswer [on|off]";
e->usage =
"Usage: console autoanswer [on|off]\n"
" Enables or disables autoanswer feature. If used without\n"
@@ -1078,23 +1077,23 @@ static char *console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli
return NULL;
case CLI_GENERATE:
return (a->pos != e->args + 1) ? NULL : ast_cli_complete(a->word, choices, a->n);
return NULL;
}
if (a->argc == e->args) {
if (a->argc == e->args - 1) {
ast_cli(a->fd, "Auto answer is %s.\n", o->autoanswer ? "on" : "off");
return CLI_SUCCESS;
}
if (a->argc != e->args + 1)
if (a->argc != e->args)
return CLI_SHOWUSAGE;
if (o == NULL) {
ast_log(LOG_WARNING, "Cannot find device %s (should not happen!)\n",
oss_active);
return CLI_FAILURE;
}
if (!strcasecmp(a->argv[e->args], "on"))
if (!strcasecmp(a->argv[e->args-1], "on"))
o->autoanswer = 1;
else if (!strcasecmp(a->argv[e->args], "off"))
else if (!strcasecmp(a->argv[e->args - 1], "off"))
o->autoanswer = 0;
else
return CLI_SHOWUSAGE;
@@ -1287,21 +1286,20 @@ static char *console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_args
static char *console_mute(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct chan_oss_pvt *o = find_desc(oss_active);
static char *choices[] = { "mute", "unmute", NULL };
char *s;
if (cmd == CLI_INIT) {
e->command = "console";
e->command = "console {mute|unmute}";
e->usage =
"Usage: console [mute|unmute]\n"
"Usage: console {mute|unmute}\n"
" Mute/unmute the microphone.\n";
return NULL;
} else if (cmd == CLI_GENERATE)
return (a->pos != e->args) ? NULL : ast_cli_complete(a->word, choices, a->n);
return NULL;
if (a->argc != e->args+1)
if (a->argc != e->args)
return CLI_SHOWUSAGE;
s = a->argv[e->args];
s = a->argv[e->args-1];
if (!strcasecmp(s, "mute"))
o->mute = 1;
else if (!strcasecmp(s, "unmute"))