1 files changed, 32 insertions, 26 deletions

diff --git a/avr/command.c b/avr/command.c
index 78b5cc4..07fff78 100644
--- a/avr/command.c
+++ b/avr/command.c
@@ -59,9 +59,8 @@ int cmpstring_PP(const void *p1, const void *p2)
 		         (*(const FLASH cmd_tbl_t **) p2)->name);
 }
 
-int cmd_tbl_item_count(void)
+int cmd_tbl_item_count(cmd_tbl_t *p)
 {
-	cmd_tbl_t * p = cmd_tbl;
 	int count = 0;
 
 	while (p->name != NULL) {
@@ -75,11 +74,9 @@ int cmd_tbl_item_count(void)
  * for long help messages
  */
 
-command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
+command_ret_t _do_help(cmd_tbl_t *tbl_start, cmd_tbl_t * cmdtp,
 		uint_fast8_t flag, int argc, char * const argv[])
 {
-	uint_fast8_t i, max_len = 0;
-	command_ret_t rcode = CMD_RET_SUCCESS;
 
 	(void) flag;
 
@@ -87,13 +84,14 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 	bool opt_debug = optenv && strstr_P(optenv, PSTR("debug")) != NULL;
 
 	if (argc == 1) {	/*show list of commands */
+		int cmd_items = cmd_tbl_item_count(tbl_start);
 		cmd_tbl_t *cmd_array[cmd_items];
-		int i;
+		cmd_tbl_t *tp = tbl_start;
+		uint_fast8_t max_len = 0;
 
 		/* Make array of commands from .uboot_cmd section */
-		cmdtp = cmd_start;
-		for (i = 0; i < cmd_items; i++) {
-			cmd_array[i] = cmdtp++;
+		for (int i = 0; i < cmd_items; i++) {
+			cmd_array[i] = tp++;
 			uint_fast8_t l = strlen_P(cmd_array[i]->name);
 			if (l > max_len)
 				max_len = l;
@@ -103,7 +101,7 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 		qsort(cmd_array, cmd_items, sizeof (cmd_tbl_t *), cmpstring_PP);
 
 		/* print short help (usage) */
-		for (i = 0; i < cmd_items; i++) {
+		for (int i = 0; i < cmd_items; i++) {
 			if (opt_debug || cmd_array[i]->name[0] != '!') {
 				const FLASH char *usage = cmd_array[i]->usage;
 
@@ -112,7 +110,7 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 					return CMD_RET_FAILURE;
 				if (usage == NULL)
 					continue;
-#ifdef GCC_BUG_61443
+#if defined(GCC_BUG_61443) || 1
 				print_usage_line(cmd_array[i]->name, max_len, usage);
 #else
 				printf_P(PSTR("%-" stringify(8) /*FIXME*/ "S - %S\n"),
@@ -122,30 +120,33 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 		}
 		return CMD_RET_SUCCESS;
 	}
+
 	/*
 	 * command help (long version)
 	 */
-	for (i = 1; i < argc; ++i) {
-		if ((cmdtp = find_cmd_tbl (argv[i], cmd_start, cmd_items )) != NULL &&
+	for (uint8_t i = 1; i < argc; ++i) {
+		if ((cmdtp = find_cmd(argv[i], tbl_start)) != NULL &&
 					(opt_debug || cmdtp->name[0] != '!')) {
 			cmd_usage(cmdtp);
 		} else {
 			printf_P(PSTR("Unknown command '%s' - try 'help'"
 				" without arguments.\n\n"), argv[i]
 				);
-			rcode = CMD_RET_FAILURE;
+			return CMD_RET_FAILURE;
 		}
 	}
-	return rcode;
+
+	return CMD_RET_SUCCESS;
 }
 
 /***************************************************************************
  * find command table entry for a command
  */
-cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
+cmd_tbl_t *find_cmd (const char *cmd, cmd_tbl_t *table)
 {
 	cmd_tbl_t *cmdtp;
 	cmd_tbl_t *cmdtp_temp = table;	/*Init value */
+	int table_len = cmd_tbl_item_count(table);
 	size_t len;
 	uint_fast8_t n_found = 0;
 
@@ -176,11 +177,6 @@ cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
 }
 
 
-cmd_tbl_t *find_cmd (const char *cmd)
-{
-	return find_cmd_tbl(cmd, cmd_tbl, cmd_tbl_item_count());
-}
-
 
 command_ret_t cmd_usage(const FLASH cmd_tbl_t *cmdtp)
 {
@@ -263,7 +259,7 @@ static int complete_cmdv(int argc, char * const argv[], char last_char, int maxv
 
 	/* more than one arg or one but the start of the next */
 	if (argc > 1 || (last_char == '\0' || isblank(last_char))) {
-		cmdtp = find_cmd(argv[0]);
+		cmdtp = find_cmd(argv[0], cmd_tbl);
 		if (cmdtp == NULL || cmdtp->complete == NULL) {
 			cmdv[0] = NULL;
 			return 0;
@@ -499,14 +495,24 @@ command_ret_t cmd_process(uint_fast8_t flag, int argc, char * const argv[],
 	cmd_tbl_t *cmdtp;
 
 	/* Look up command in command table */
-	cmdtp = find_cmd(argv[0]);
+	cmdtp = find_cmd(argv[0], cmd_tbl);
 	if (cmdtp == NULL) {
 		printf_P(PSTR("Unknown command '%s' - try 'help'\n"), argv[0]);
 		return CMD_RET_FAILURE;
 	}
-	if (!cmdtp->cmd) {
-		debug("### Command '%s' found, but ->cmd == NULL \n", argv[0]);
-		return CMD_RET_FAILURE;
+
+	/* Check for subcommand */
+	if (cmdtp->subcmd && argc > 1) {
+
+		/* Look up subcommand in subcommand table */
+		cmd_tbl_t *cmdtpsub = find_cmd(argv[1], cmdtp->subcmd);
+		if (cmdtpsub == NULL) {
+			printf_P(PSTR("Unknown '%s' subcommand '%s' - try '%s help'\n"), argv[0], argv[1], argv[0]);
+			return CMD_RET_FAILURE;
+		}
+		cmdtp = cmdtpsub;
+		--argc;
+		++argv;
 	}
 
 	/* found - check max args */