X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/b30c4e8f1aef96f6fdc93da9f125545f5f74d06e..8315e7f4ea0204718e520e48a48739fd0371bd28:/avr/command.c

diff --git a/avr/command.c b/avr/command.c
index cd2ee39..aa784cb 100644
--- a/avr/command.c
+++ b/avr/command.c
@@ -59,9 +59,10 @@ 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) {
@@ -70,30 +71,88 @@ int cmd_tbl_item_count(void)
 	return count;
 }
 
+
+cmd_tbl_t *get_cmd_tbl_base(cmd_tbl_t  *cmdtp)
+{
+	cmd_tbl_t *p = cmdtp;
+
+	while (p->name != NULL)
+		++p;
+
+	return p->subcmd;
+}
+
+/*
+ * find command table entry for a command
+ */
+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;
+
+	char *optenv = getenv_str(PSTR("cmd"));
+	bool opt_debug = optenv && strstr_P(optenv, PSTR("debug")) != NULL;
+
+	if (!cmd)
+		return NULL;
+
+	len = strlen(cmd);
+
+	for (cmdtp = table;
+	     cmdtp != table + table_len;
+	     cmdtp++) {
+		if (strncmp_P(cmd, cmdtp->name, len) == 0 &&
+					(opt_debug || cmdtp->name[0] != '!')) {
+			if (len == strlen_P(cmdtp->name))
+				return cmdtp;	/* full match */
+
+			cmdtp_temp = cmdtp;	/* abbreviated command ? */
+			n_found++;
+		}
+	}
+	if (n_found == 1)			/* exactly one match */
+		return cmdtp_temp;
+
+	return NULL;	/* not found or ambiguous command */
+}
+
+cmd_tbl_t *find_cmd_sub(const char *cmd, cmd_tbl_t *table)
+{
+	cmd_tbl_t *entry = NULL;
+
+	for (cmd_tbl_t *tp = get_cmd_tbl_base(table); tp->name && entry == NULL; tp++)
+		if (tp->subcmd && tp->flags & CTBL_SUBCMDAUTO)
+			entry = find_cmd(cmd, tp->subcmd);
+
+	return entry;
+}
+
 /*
  * Use puts() instead of printf() to avoid printf buffer overflow
  * for long help messages
  */
 
-command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
-		int flag, int argc, char * const argv[])
+command_ret_t do_help(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;
 
+	cmd_tbl_t *tbl_start = get_cmd_tbl_base(cmdtp);
+
 	char *optenv = getenv_str(PSTR("cmd"));
 	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 +162,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 +171,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,63 +181,23 @@ 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;
-}
-
-/***************************************************************************
- * 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 *cmdtp;
-	cmd_tbl_t *cmdtp_temp = table;	/*Init value */
-	size_t len;
-	uint_fast8_t n_found = 0;
-
-	char *optenv = getenv_str(PSTR("cmd"));
-	bool opt_debug = optenv && strstr_P(optenv, PSTR("debug")) != NULL;
-
-	if (!cmd)
-		return NULL;
-
-	len = strlen(cmd);
 
-	for (cmdtp = table;
-	     cmdtp != table + table_len;
-	     cmdtp++) {
-		if (strncmp_P(cmd, cmdtp->name, len) == 0 &&
-					(opt_debug || cmdtp->name[0] != '!')) {
-			if (len == strlen_P(cmdtp->name))
-				return cmdtp;	/* full match */
-
-			cmdtp_temp = cmdtp;	/* abbreviated command ? */
-			n_found++;
-		}
-	}
-	if (n_found == 1)			/* exactly one match */
-		return cmdtp_temp;
-
-	return NULL;	/* not found or ambiguous command */
-}
-
-
-cmd_tbl_t *find_cmd (const char *cmd)
-{
-	return find_cmd_tbl(cmd, cmd_tbl, cmd_tbl_item_count());
+	return CMD_RET_SUCCESS;
 }
 
 
@@ -263,7 +282,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;
@@ -482,7 +501,7 @@ int cmd_auto_complete(const FLASH char *const prompt, char *buf, int *np, int *c
  * @param argv		Arguments
  * @return 0 if command succeeded, else non-zero (CMD_RET_...)
  */
-command_ret_t cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t cmd_call(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
 	command_ret_t result;
 
@@ -492,22 +511,39 @@ command_ret_t cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
 	return result;
 }
 
-command_ret_t cmd_process(int flag, int argc, char * const argv[],
+#pragma GCC diagnostic ignored "-Wclobbered"
+
+command_ret_t cmd_process(uint_fast8_t flag, int argc, char * const argv[],
 			       uint_fast8_t *repeatable)
 {
 	command_ret_t rc = CMD_RET_SUCCESS;
 	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) {
+		/* Check if this command has subcommands */
+		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;
+		}
+	} else {
+		/* Search subcommands */
+		cmdtp = find_cmd_sub(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;
-	}
 
 	/* found - check max args */
 	if (argc > cmdtp->maxargs)
@@ -531,7 +567,7 @@ command_ret_t cmd_process(int flag, int argc, char * const argv[],
 	/* If OK so far, then do the command */
 	if (!rc) {
 		rc = cmd_call(cmdtp, flag, argc, argv);
-		*repeatable &= cmdtp->repeatable;
+		*repeatable &= (cmdtp->flags & CTBL_REPEAT) != 0;
 	}
 	if (rc == CMD_RET_USAGE)
 		rc = cmd_usage(cmdtp);