From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 24 May 2005 10:29:12 +0000 (+0000)
Subject: fix output when no help text is available for a cli command
X-Git-Tag: 1.0.11.1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c98832d092fe8fd01930a137b112ed35a3924430;p=thirdparty%2Fasterisk.git

fix output when no help text is available for a cli command
fix a seg fault when astmm is enabled (bug #4356)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cli.c b/cli.c
index f72d087f20..bbcd4820de 100755
--- a/cli.c
+++ b/cli.c
@@ -918,9 +918,14 @@ static int handle_help(int fd, int argc, char *argv[]) {
 		return RESULT_SHOWUSAGE;
 	if (argc > 1) {
 		e = find_cli(argv + 1, 1);
-		if (e) 
-			ast_cli(fd, e->usage);
-		else {
+		if (e) {
+			if (e->usage)
+				ast_cli(fd, e->usage);
+			else {
+				join(fullcmd, sizeof(fullcmd), argv+1);
+				ast_cli(fd, "No help text available for '%s'.\n", fullcmd);
+			}
+		} else {
 			if (find_cli(argv + 1, -1)) {
 				return help_workhorse(fd, argv + 1);
 			} else {