Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments"

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47051 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 32 insertions, 145 deletions

diff --git a/main/cli.c b/main/cli.c
index 5e2d2e180..cfd8ccce9 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -76,11 +76,11 @@ void ast_cli(int fd, char *fmt, ...)
 static AST_LIST_HEAD_STATIC(helpers, ast_cli_entry);
 
 static char load_help[] = 
-"Usage: module load <module name>\n"
+"Usage: load <module name>\n"
 "       Loads the specified module into Asterisk.\n";
 
 static char unload_help[] = 
-"Usage: module unload [-f|-h] <module name>\n"
+"Usage: unload [-f|-h] <module name>\n"
 "       Unloads the specified module from Asterisk. The -f\n"
 "       option causes the module to be unloaded even if it is\n"
 "       in use (may cause a crash) and the -h module causes the\n"
@@ -94,32 +94,32 @@ static char help_help[] =
 "       topic, it provides a list of commands.\n";
 
 static char chanlist_help[] = 
-"Usage: channel list [concise|verbose]\n"
+"Usage: core show channels [concise|verbose]\n"
 "       Lists currently defined channels and some information about them. If\n"
 "       'concise' is specified, the format is abridged and in a more easily\n"
 "       machine parsable format. If 'verbose' is specified, the output includes\n"
 "       more and longer fields.\n";
 
 static char reload_help[] = 
-"Usage: module reload [module ...]\n"
+"Usage: reload [module ...]\n"
 "       Reloads configuration files for all listed modules which support\n"
 "       reloading, or for all supported modules if none are listed.\n";
 
 static char verbose_help[] = 
-"Usage: core verbose <level>\n"
+"Usage: core set verbose <level>\n"
 "       Sets level of verbose messages to be displayed.  0 means\n"
 "       no messages should be displayed. Equivalent to -v[v[v...]]\n"
 "       on startup\n";
 
 static char debug_help[] = 
-"Usage: core debug <level> [filename]\n"
+"Usage: core set debug <level> [filename]\n"
 "       Sets level of core debug messages to be displayed.  0 means\n"
 "       no messages should be displayed.  Equivalent to -d[d[d...]]\n"
 "       on startup.  If filename is specified, debugging will be\n"
 "       limited to just that file.\n";
 
 static char nodebug_help[] = 
-"Usage: core nodebug\n"
+"Usage: core set no debug\n"
 "       Turns off core debug messages.\n";
 
 static char logger_mute_help[] = 
@@ -133,12 +133,12 @@ static char softhangup_help[] =
 "       the next time the driver reads or writes from the channel\n";
 
 static char group_show_channels_help[] = 
-"Usage: group list channels [pattern]\n"
+"Usage: group show channels [pattern]\n"
 "       Lists all currently active channels with channel group(s) specified.\n"
 "       Optional regular expression pattern is matched to group names for each\n"
 "       channel.\n";
 
-static int handle_load_deprecated(int fd, int argc, char *argv[])
+static int handle_load(int fd, int argc, char *argv[])
 {
 	if (argc != 2)
 		return RESULT_SHOWUSAGE;
@@ -149,18 +149,7 @@ static int handle_load_deprecated(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int handle_load(int fd, int argc, char *argv[])
-{
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-	if (ast_load_resource(argv[2])) {
-		ast_cli(fd, "Unable to load module %s\n", argv[2]);
-		return RESULT_FAILURE;
-	}
-	return RESULT_SUCCESS;
-}
-
-static int handle_reload_deprecated(int fd, int argc, char *argv[])
+static int handle_reload(int fd, int argc, char *argv[])
 {
 	int x;
 	int res;
@@ -183,29 +172,6 @@ static int handle_reload_deprecated(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int handle_reload(int fd, int argc, char *argv[])
-{
-	int x;
-	int res;
-	if (argc < 2)
-		return RESULT_SHOWUSAGE;
-	if (argc > 2) { 
-		for (x=2;x<argc;x++) {
-			res = ast_module_reload(argv[x]);
-			switch(res) {
-			case 0:
-				ast_cli(fd, "No such module '%s'\n", argv[x]);
-				break;
-			case 1:
-				ast_cli(fd, "Module '%s' does not support reload\n", argv[x]);
-				break;
-			}
-		}
-	} else
-		ast_module_reload(NULL);
-	return RESULT_SUCCESS;
-}
-
 static int handle_set_verbose_deprecated(int fd, int argc, char *argv[])
 {
 	int val = 0;
@@ -403,7 +369,7 @@ static int handle_logger_mute(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int handle_unload_deprecated(int fd, int argc, char *argv[])
+static int handle_unload(int fd, int argc, char *argv[])
 {
 	int x;
 	int force=AST_FORCE_SOFT;
@@ -431,34 +397,6 @@ static int handle_unload_deprecated(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int handle_unload(int fd, int argc, char *argv[])
-{
-	int x;
-	int force=AST_FORCE_SOFT;
-	if (argc < 3)
-		return RESULT_SHOWUSAGE;
-	for (x=2;x<argc;x++) {
-		if (argv[x][0] == '-') {
-			switch(argv[x][1]) {
-			case 'f':
-				force = AST_FORCE_FIRM;
-				break;
-			case 'h':
-				force = AST_FORCE_HARD;
-				break;
-			default:
-				return RESULT_SHOWUSAGE;
-			}
-		} else if (x !=  argc - 1) 
-			return RESULT_SHOWUSAGE;
-		else if (ast_unload_resource(argv[x], force)) {
-			ast_cli(fd, "Unable to unload resource %s\n", argv[x]);
-			return RESULT_FAILURE;
-		}
-	}
-	return RESULT_SUCCESS;
-}
-
 #define MODLIST_FORMAT  "%-30s %-40.40s %-10d\n"
 #define MODLIST_FORMAT2 "%-30s %-40.40s %-10s\n"
 
@@ -476,11 +414,11 @@ static int modlist_modentry(const char *module, const char *description, int use
 }
 
 static char modlist_help[] =
-"Usage: module list [like keyword]\n"
+"Usage: core show modules [like keyword]\n"
 "       Shows Asterisk modules currently in use, and usage statistics.\n";
 
 static char uptime_help[] =
-"Usage: show uptime [seconds]\n"
+"Usage: core show uptime [seconds]\n"
 "       Shows Asterisk uptime information.\n"
 "       The seconds word returns the uptime in seconds only.\n";
 
@@ -1018,16 +956,6 @@ static char *complete_ch_4(const char *line, const char *word, int pos, int stat
 	return ast_complete_channels(line, word, pos, state, 3);
 }
 
-static char *complete_mod_2_nr(const char *line, const char *word, int pos, int state)
-{
-	return ast_module_helper(line, word, pos, state, 1, 0);
-}
-
-static char *complete_mod_2(const char *line, const char *word, int pos, int state)
-{
-	return ast_module_helper(line, word, pos, state, 1, 1);
-}
-
 static char *complete_mod_3_nr(const char *line, const char *word, int pos, int state)
 {
 	return ast_module_helper(line, word, pos, state, 2, 0);
@@ -1043,33 +971,12 @@ static char *complete_mod_4(const char *line, const char *word, int pos, int sta
 	return ast_module_helper(line, word, pos, state, 3, 0);
 }
 
-static char *complete_fn_deprecated(const char *line, const char *word, int pos, int state)
-{
-	char *c;
-	char filename[256];
-
-	if (pos != 1)
-		return NULL;
-	
-	if (word[0] == '/')
-		ast_copy_string(filename, word, sizeof(filename));
-	else
-		snprintf(filename, sizeof(filename), "%s/%s", ast_config_AST_MODULE_DIR, word);
-	
-	c = filename_completion_function(filename, state);
-	
-	if (c && word[0] != '/')
-		c += (strlen(ast_config_AST_MODULE_DIR) + 1);
-	
-	return c ? strdup(c) : c;
-}
-
 static char *complete_fn(const char *line, const char *word, int pos, int state)
 {
 	char *c;
 	char filename[256];
 
-	if (pos != 2)
+	if (pos != 1)
 		return NULL;
 	
 	if (word[0] == '/')
@@ -1179,26 +1086,11 @@ static struct ast_cli_entry cli_debug_level_deprecated = {
 	handle_debuglevel_deprecated, NULL,
 	NULL };
 
-static struct ast_cli_entry cli_group_show_channels_deprecated = {
-	{ "group", "show", "channels", NULL },
-	group_show_channels, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_load_deprecated = {
-	{ "load", NULL },
-	handle_load_deprecated, NULL,
-	NULL, complete_fn_deprecated };
-
 static struct ast_cli_entry cli_no_debug_channel_deprecated = {
 	{ "no", "debug", "channel", NULL },
 	handle_nodebugchan_deprecated, NULL,
 	NULL, complete_ch_4 };
 
-static struct ast_cli_entry cli_reload_deprecated = {
-	{ "reload", NULL },
-	handle_reload_deprecated, NULL,
-	NULL, complete_mod_2 };
-
 static struct ast_cli_entry cli_set_debug_deprecated = {
 	{ "set", "debug", NULL },
 	handle_set_debug_deprecated, NULL,
@@ -1229,43 +1121,38 @@ static struct ast_cli_entry cli_show_modules_like_deprecated = {
 	handle_modlist, NULL,
 	NULL, complete_mod_4 };
 
-static struct ast_cli_entry cli_unload_deprecated = {
-	{ "unload", NULL },
-	handle_unload_deprecated, NULL,
-	NULL, complete_mod_2_nr };
-
 static struct ast_cli_entry cli_cli[] = {
-	{ { "channel", "list", NULL },
+	{ { "core", "show", "channels", NULL },
 	handle_chanlist, "Display information on channels",
 	chanlist_help, complete_show_channels, &cli_show_channels_deprecated },
 
-	{ { "channel", "show", NULL },
+	{ { "core", "show" "channel", NULL },
 	handle_showchan, "Display information on a specific channel",
 	showchan_help, complete_ch_3, &cli_show_channel_deprecated },
 
-	{ { "channel", "debug", NULL },
+	{ { "core", "debug", "channel", NULL },
 	handle_debugchan, "Enable debugging on a channel",
 	debugchan_help, complete_ch_3, &cli_debug_channel_deprecated },
 
-	{ { "channel", "nodebug", NULL },
+	{ { "core", "no", "debug", "channel", NULL },
 	handle_nodebugchan, "Disable debugging on a channel",
 	nodebugchan_help, complete_ch_3, &cli_no_debug_channel_deprecated },
 
-	{ { "core", "debug", NULL },
+	{ { "core", "set", "debug", NULL },
 	handle_debug, "Set level of debug chattiness",
 	debug_help, NULL, &cli_set_debug_deprecated },
 
-	{ { "core", "nodebug", NULL },
+	{ { "core", "set", "no", "debug", NULL },
 	handle_nodebug, "Turns off debug chattiness",
 	nodebug_help },
 
-	{ { "core", "verbose", NULL },
+	{ { "core", "set", "verbose", NULL },
 	handle_verbose, "Set level of verboseness",
 	verbose_help, NULL, &cli_set_verbose_deprecated },
 
-	{ { "group", "list", "channels", NULL },
+	{ { "group", "show", "channels", NULL },
 	group_show_channels, "Display active channels with group(s)",
-	group_show_channels_help, NULL, &cli_group_show_channels_deprecated },
+	group_show_channels_help },
 
 	{ { "help", NULL },
 	handle_help, "Display help list, or specific help on a command",
@@ -1275,27 +1162,27 @@ static struct ast_cli_entry cli_cli[] = {
 	handle_logger_mute, "Toggle logging output to a console",
 	logger_mute_help },
 
-	{ { "module", "list", NULL },
+	{ { "core", "show", "modules", NULL },
 	handle_modlist, "List modules and info",
 	modlist_help, NULL, &cli_show_modules_deprecated },
 
-	{ { "module", "list", "like", NULL },
+	{ { "core", "show", "modules", "like", NULL },
 	handle_modlist, "List modules and info",
 	modlist_help, complete_mod_4, &cli_show_modules_like_deprecated },
 
-	{ { "module", "load", NULL },
+	{ { "load", NULL },
 	handle_load, "Load a module by name",
-	load_help, complete_fn, &cli_load_deprecated },
+	load_help, complete_fn },
 
-	{ { "module", "reload", NULL },
+	{ { "reload", NULL },
 	handle_reload, "Reload configuration",
-	reload_help, complete_mod_3, &cli_reload_deprecated },
+	reload_help, complete_mod_3 },
 
-	{ { "module", "unload", NULL },
+	{ { "unload", NULL },
 	handle_unload, "Unload a module by name",
-	unload_help, complete_mod_3_nr, &cli_unload_deprecated },
+	unload_help, complete_mod_3_nr },
 
- 	{ { "show", "uptime", NULL },
+ 	{ { "core", "show", "uptime", NULL },
 	handle_showuptime, "Show uptime information",
 	uptime_help },