don't try to print the help text for a CLI command when RESULT_SHOWUSAGE is
authorRussell Bryant <russell@russellbryant.com>
Mon, 27 Feb 2006 15:23:44 +0000 (15:23 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 27 Feb 2006 15:23:44 +0000 (15:23 +0000)
returned if there is no help text available (issue #6604)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11282 65c4cc65-6c06-0410-ace0-fbb531ad65f3

cli.c

diff --git a/cli.c b/cli.c
index 5915aad..9531165 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1383,7 +1383,10 @@ int ast_cli_command(int fd, const 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, "Invalid usage, but no usage information available.\n");
                                break;
                        }
                } else