* Command Processor Table
*/
+#include "command.h"
#include "common.h"
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <setjmp.h>
#include "config.h"
#include "print-utils.h"
#include "con-utils.h"
#include "env.h"
#include "debug.h"
-#include "command.h"
+
+
+jmp_buf cmd_jbuf;
static void print_usage_line(const FLASH char *name, int width,
(*(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) {
* 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 *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;
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;
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;
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"),
}
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;
}
-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)
{
/* 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;
* @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;
return result;
}
-command_ret_t cmd_process(int flag, int argc, char * const argv[],
+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) {
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 */
}
#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);