X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/d684c21619905153eff68c43927207248925f6c2..8315e7f4ea0204718e520e48a48739fd0371bd28:/avr/command.c diff --git a/avr/command.c b/avr/command.c index ad39006..aa784cb 100644 --- a/avr/command.c +++ b/avr/command.c @@ -1,33 +1,41 @@ +/* + * (C) Copyright 2014, 2016 Leo C. + * + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * SPDX-License-Identifier: GPL-2.0 + */ /* * Command Processor Table */ +#include "command.h" #include "common.h" - +#include #include #include -#include -#include +#include #include "config.h" -#include "debug.h" +#include "print-utils.h" #include "con-utils.h" #include "env.h" -#include "timer.h" -#include "command.h" +#include "debug.h" -static void print_blanks(int_fast8_t count) -{ - while(count--) - putchar(' '); -} +jmp_buf cmd_jbuf; -static void print_usage_line(const FLASH char *name, const FLASH char *usage) + +static void print_usage_line(const FLASH char *name, int width, + const FLASH char *usage) { + width -= strlen_P(name); + if (width < 0) + width = 0; my_puts_P(name); - print_blanks(CONFIG_SYS_MAXARGS - strlen_P(name)); + print_blanks(width); my_puts_P(PSTR(" - ")); my_puts_P(usage); my_puts_P(PSTR("\n")); @@ -37,7 +45,7 @@ int strcmp_PP(const FLASH char *s1, const FLASH char *s2) { unsigned char c1, c2; - while ((c1 = *(const FLASH unsigned char *)s1++) + while ((c1 = *(const FLASH unsigned char *)s1++) == (c2 = *(const FLASH unsigned char *)s2++)) if (c1 == 0) return 0; @@ -45,15 +53,16 @@ int strcmp_PP(const FLASH char *s1, const FLASH char *s2) return c1 - c2; } -int cmpstringp(const void *p1, const void *p2) +int cmpstring_PP(const void *p1, const void *p2) { - return strcmp_PP((*(const FLASH cmd_tbl_t **) p1)->name, + return strcmp_PP((*(const FLASH cmd_tbl_t **) p1)->name, (*(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) { @@ -62,76 +71,31 @@ int cmd_tbl_item_count(void) return count; } -/* - * Use puts() instead of printf() to avoid printf buffer overflow - * for long help messages - */ -int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, - int flag, int argc, char * const argv[]) +cmd_tbl_t *get_cmd_tbl_base(cmd_tbl_t *cmdtp) { - uint_fast8_t i; - int rcode = 0; + cmd_tbl_t *p = cmdtp; - (void) flag; - - if (argc == 1) { /*show list of commands */ - cmd_tbl_t *cmd_array[cmd_items]; - int i; + while (p->name != NULL) + ++p; - /* Make array of commands from .uboot_cmd section */ - cmdtp = cmd_start; - for (i = 0; i < cmd_items; i++) { - cmd_array[i] = cmdtp++; - } - - /* Sort command list */ - qsort(cmd_array, cmd_items, sizeof (cmd_tbl_t *), cmpstringp); - - /* print short help (usage) */ - for (i = 0; i < cmd_items; i++) { - const FLASH char *usage = cmd_array[i]->usage; - - /* allow user abort */ - if (ctrlc ()) - return 1; - if (usage == NULL) - continue; -#ifdef GCC_BUG_61443 - print_usage_line(cmd_array[i]->name, usage); -#else - printf_P(PSTR("%-" stringify(CONFIG_SYS_MAXARGS) "S - %S\n"), - cmd_array[i]->name, usage); -#endif - } - return 0; - } - /* - * command help (long version) - */ - for (i = 1; i < argc; ++i) { - if ((cmdtp = find_cmd_tbl (argv[i], cmd_start, cmd_items )) != NULL) { - rcode |= cmd_usage(cmdtp); - } else { - printf_P(PSTR("Unknown command '%s' - try 'help'" - " without arguments.\n\n"), argv[i] - ); - rcode = 1; - } - } - return rcode; + return p->subcmd; } -/*************************************************************************** +/* * 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 len; + 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; @@ -140,35 +104,110 @@ cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len) for (cmdtp = table; cmdtp != table + table_len; cmdtp++) { - if (strncmp_P (cmd, cmdtp->name, len) == 0) { - if (len == strlen (cmdtp->name)) + 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 */ + 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 + */ -cmd_tbl_t *find_cmd (const char *cmd) +command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { - return find_cmd_tbl(cmd, cmd_tbl, cmd_tbl_item_count()); + (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]; + cmd_tbl_t *tp = tbl_start; + uint_fast8_t max_len = 0; + + /* Make array of commands from .uboot_cmd section */ + 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; + } + + /* Sort command list */ + qsort(cmd_array, cmd_items, sizeof (cmd_tbl_t *), cmpstring_PP); + + /* print short help (usage) */ + for (int i = 0; i < cmd_items; i++) { + if (opt_debug || cmd_array[i]->name[0] != '!') { + const FLASH char *usage = cmd_array[i]->usage; + + /* allow user abort */ + if (ctrlc ()) + return CMD_RET_FAILURE; + if (usage == NULL) + continue; +#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"), + cmd_array[i]->name, usage); +#endif + } + } + return CMD_RET_SUCCESS; + } + + /* + * command help (long version) + */ + 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] + ); + return CMD_RET_FAILURE; + } + } + + return CMD_RET_SUCCESS; } -int cmd_usage(const FLASH cmd_tbl_t *cmdtp) +command_ret_t cmd_usage(const FLASH cmd_tbl_t *cmdtp) { // printf("%s - %s\n\n", cmdtp->name, cmdtp->usage); - print_usage_line(cmdtp->name, cmdtp->usage); + print_usage_line(cmdtp->name, 0, cmdtp->usage); #if 0 my_puts_P(cmdtp->name); - print_blanks(CONFIG_SYS_MAXARGS - strlen_P(cmdtp->name)); + print_blanks(/*FIXME*/ 8 - strlen_P(cmdtp->name)); my_puts_P(PSTR(" - ")); my_puts_P(cmdtp->usage); my_puts_P(PSTR("\n\n")); @@ -177,23 +216,24 @@ int cmd_usage(const FLASH cmd_tbl_t *cmdtp) // printf("Usage:\n%s ", cmdtp->name); my_puts_P(PSTR("Usage:\n")); my_puts_P(cmdtp->name); + my_puts_P(PSTR(" ")); if (!cmdtp->help) { my_puts_P(PSTR(" - No additional help available.\n")); - return 1; + return CMD_RET_FAILURE; } my_puts_P(cmdtp->help); my_puts_P(PSTR("\n")); #endif /* CONFIG_SYS_LONGHELP */ - return 1; + return CMD_RET_FAILURE; } #ifdef CONFIG_AUTO_COMPLETE int var_complete(int argc, char * const argv[], char last_char, int maxv, char *cmdv[]) { - static char tmp_buf[512]; + static char tmp_buf[CONFIG_SYS_CBSIZE]; int space; space = last_char == '\0' || isblank(last_char); @@ -209,6 +249,8 @@ int var_complete(int argc, char * const argv[], char last_char, int maxv, char * /*************************************************************************************/ +/* TODO: cmdtp points to FLASH */ + static int complete_cmdv(int argc, char * const argv[], char last_char, int maxv, char *cmdv[]) { cmd_tbl_t *cmdtp = cmd_tbl; @@ -240,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; @@ -356,6 +398,7 @@ static int find_common_prefix(char * const argv[]) static char tmp_buf[CONFIG_SYS_CBSIZE]; /* copy of console I/O buffer */ + int cmd_auto_complete(const FLASH char *const prompt, char *buf, int *np, int *colp) { int n = *np, col = *colp; @@ -458,31 +501,48 @@ 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_...) */ -static int 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[]) { - int result; + command_ret_t result; result = (cmdtp->cmd)(cmdtp, flag, argc, argv); - if (result) - debug("Command failed, result=%d\n", result); +// if (result != CMD_RET_SUCCESS) +// debug("Command failed, result=%d\n", result); return result; } -enum 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) { - enum command_ret_t rc = CMD_RET_SUCCESS; + 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 1; - } - if (!cmdtp->cmd) { - debug("### Command '%s' found, but ->cmd == NULL \n", argv[0]); - return 1; + return CMD_RET_FAILURE; } /* found - check max args */ @@ -501,10 +561,13 @@ enum command_ret_t cmd_process(int flag, int argc, char * const argv[], } #endif + if (setjmp(cmd_jbuf) != 0) + return CMD_RET_FAILURE; + /* 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);