diff options
| author | Jason Parker <jparker@digium.com> | 2008-01-09 20:30:54 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2008-01-09 20:30:54 +0000 |
| commit | 46f4c8946f54f5ab04921c1d08dd5b4c808bccff (patch) | |
| tree | dc301dcdb33b1fa4166f56347520b51edb9abe71 | |
| parent | 0c1ded4cb5699cfe7e4d1b4f8c1bf237595719e5 (diff) | |
Merged revisions 97622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #11718)
........
r97622 | qwell | 2008-01-09 14:28:43 -0600 (Wed, 09 Jan 2008) | 5 lines
Correctly display a message if a command could not be found.
Also fix a comment which may have led to this happening.
Issue 11718, reported by kshumard.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/cli.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/cli.c b/main/cli.c index d63411ec1..72cd8152f 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1535,10 +1535,8 @@ int ast_cli_unregister_multiple(struct ast_cli_entry *e, int len) } -/*! \brief helper for final part of - * handle_help. if locked = 0 it's just "help_workhorse", - * otherwise assume the list is already locked and print - * an error message if not found. +/*! \brief helper for final part of handle_help + * if locked = 1, assume the list is already locked */ static char *help1(int fd, char *match[], int locked) { @@ -1567,7 +1565,7 @@ static char *help1(int fd, char *match[], int locked) } if (!locked) AST_RWLIST_UNLOCK(&helpers); - if (!locked && !found && matchstr[0]) + if (!found && matchstr[0]) ast_cli(fd, "No such command '%s'.\n", matchstr); return CLI_SUCCESS; } |