automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-27 16:04:08 +00:00
parent b7ad6d8c2d
commit 0a4506d0dd
2 changed files with 8 additions and 2 deletions

5
cli.c
View File

@@ -1363,7 +1363,10 @@ int ast_cli_command(int fd, char *s)
if (e) {
switch(e->handler(fd, x, argv)) {
case RESULT_SHOWUSAGE:
ast_cli(fd, "%s", e->usage);
if (e->usage)
ast_cli(fd, "%s", e->usage);
else
ast_cli(fd, "%s", "Invalid usage, but no usage information available.\n");
break;
}
} else