+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
/*
* Command Processor Table
*/
#include "common.h"
-
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
#include "config.h"
-#include "debug.h"
+#include "print-utils.h"
#include "con-utils.h"
+#ifdef CONFIG_AUTO_COMPLETE
#include "env.h"
-#include "timer.h"
+#endif
+#include "debug.h"
#include "command.h"
-static void print_blanks(int_fast8_t count)
-{
- while(count--)
- putchar(' ');
-}
-
-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"));
{
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;
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);
}
* for long help messages
*/
-int _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
+command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
int flag, int argc, char * const argv[])
{
- uint_fast8_t i;
- int rcode = 0;
+ uint_fast8_t i, max_len = 0;
+ command_ret_t rcode = CMD_RET_SUCCESS;
(void) flag;
cmdtp = cmd_start;
for (i = 0; i < cmd_items; i++) {
cmd_array[i] = cmdtp++;
+ 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 *), cmpstringp);
+ qsort(cmd_array, cmd_items, sizeof (cmd_tbl_t *), cmpstring_PP);
/* print short help (usage) */
for (i = 0; i < cmd_items; i++) {
/* allow user abort */
if (ctrlc ())
- return 1;
+ return CMD_RET_FAILURE;
if (usage == NULL)
continue;
-#ifdef GCC_BUG_61443
- print_usage_line(cmd_array[i]->name, usage);
+#ifdef GCC_BUG_61443
+ print_usage_line(cmd_array[i]->name, max_len, usage);
#else
- printf_P(PSTR("%-" stringify(CONFIG_SYS_MAXARGS) "S - %S\n"),
+ printf_P(PSTR("%-" stringify(8) /*FIXME*/ "S - %S\n"),
cmd_array[i]->name, usage);
#endif
}
- return 0;
+ 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) {
- rcode |= cmd_usage(cmdtp);
+ cmd_usage(cmdtp);
} else {
printf_P(PSTR("Unknown command '%s' - try 'help'"
" without arguments.\n\n"), argv[i]
);
- rcode = 1;
+ rcode = CMD_RET_FAILURE;
}
}
return rcode;
{
cmd_tbl_t *cmdtp;
cmd_tbl_t *cmdtp_temp = table; /*Init value */
- int len;
+ size_t len;
uint_fast8_t n_found = 0;
if (!cmd)
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) {
+ if (len == strlen_P(cmdtp->name))
return cmdtp; /* full match */
cmdtp_temp = cmdtp; /* abbreviated command ? */
}
-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"));
// printf("Usage:\n%s ", cmdtp->name);
my_puts_P(PSTR("Usage:\n"));
my_puts_P(cmdtp->name);
- putchar(' ');
+ 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);
/*************************************************************************************/
+/* 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;
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;
* @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, int flag, int argc, char * const argv[])
{
- int result;
+ command_ret_t result;
result = (cmdtp->cmd)(cmdtp, flag, argc, argv);
- if (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[],
+command_ret_t cmd_process(int 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]);
if (cmdtp == NULL) {
printf_P(PSTR("Unknown command '%s' - try 'help'\n"), argv[0]);
- return 1;
+ return CMD_RET_FAILURE;
}
if (!cmdtp->cmd) {
debug("### Command '%s' found, but ->cmd == NULL \n", argv[0]);
- return 1;
+ return CMD_RET_FAILURE;
}
/* found - check max args */
projects / z180-stamp.git / blobdiff