merge qwell's CLI verbification work

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

1 files changed, 13 insertions, 7 deletions

diff --git a/main/http.c b/main/http.c
index 230fec9af..9666539c7 100644
--- a/main/http.c
+++ b/main/http.c
@@ -681,18 +681,24 @@ int ast_http_reload(void)
 }
 
 static char show_http_help[] =
-"Usage: http show status\n"
-"       Shows status of internal HTTP engine\n";
-
-static struct ast_cli_entry http_cli[] = {
-	{ { "http", "show", "status", NULL }, handle_show_http,
-	  "Display HTTP server status", show_http_help },
+"Usage: http list status\n"
+"       Lists status of internal HTTP engine\n";
+
+static struct ast_cli_entry cli_http_show_status_deprecated = {
+	{ "http", "show", "status", NULL },
+	handle_show_http, NULL,
+	NULL };
+
+static struct ast_cli_entry cli_http[] = {
+	{ { "http", "list", "status", NULL },
+	handle_show_http, "Display HTTP server status",
+	show_http_help, NULL, &cli_http_show_status_deprecated },
 };
 
 int ast_http_init(void)
 {
 	ast_http_uri_link(&statusuri);
 	ast_http_uri_link(&staticuri);
-	ast_cli_register_multiple(http_cli, sizeof(http_cli) / sizeof(http_cli[0]));
+	ast_cli_register_multiple(cli_http, sizeof(cli_http) / sizeof(struct ast_cli_entry));
 	return __ast_http_load(0);
 }