#include "env.h"
#include "debug.h"
#include "getopt-min.h"
+#include "strerror.h"
#define DEBUG_CMD 0 /* set to 1 to debug */
return NULL;
}
-static int print_name_prefix(cmd_tbl_t *p)
+static int print_nameprefix(cmd_tbl_t *p)
{
cmd_tbl_t *top = get_cmd_tbl_parent(p);
return width;
}
+static int print_prefixed_name(cmd_tbl_t *p)
+{
+ int len;
+
+ len = print_nameprefix(p);
+ len += strlen_P(p->name);
+ my_puts_P(p->name);
+
+ return len;
+}
+
static void print_usage_line(cmd_tbl_t *p, int width)
{
- width -= strlen_P(p->name);
- width -= print_name_prefix(p);
+ width -= print_prefixed_name(p);
if (width < 0)
width = 0;
- my_puts_P(p->name);
print_blanks(width);
my_puts_P(PSTR(" - "));
puts_P(p->usage);
print_usage_line(cmdtp, 0);
#ifdef CONFIG_SYS_LONGHELP
my_puts_P(PSTR("Usage:\n"));
- print_name_prefix(cmdtp);
- my_puts_P(cmdtp->name);
+ print_prefixed_name(cmdtp);
my_puts_P(PSTR(" "));
if (cmdtp->help && *cmdtp->help != '\0')
#endif /* CONFIG_AUTO_COMPLETE */
+static cmd_tbl_t *cmd_invocation_ptr;
/**
* Call a command function. This should be the only route in U-Boot to call
/* If OK so far, then do the command */
if (!rc) {
+ cmd_invocation_ptr = cmdtp;
rc = cmd_call(cmdtp, flag, argc, argv);
*repeatable &= (cmdtp->flags & CTBL_RPT) != 0;
}
return 0;
}
+
+void cmd_error(int status, int errnum, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ print_prefixed_name(cmd_invocation_ptr);
+ if (fmt != NULL) {
+ my_puts_P(PSTR(": "));
+ vfprintf_P(stdout, fmt, ap);
+ }
+ va_end(ap);
+
+ if (errnum != 0)
+ printf_P(PSTR(": %S"), my_strerror_P(errnum));
+
+ putchar('\n');
+ _delay_ms(20);
+
+ if (status != 0) {
+ longjmp(cmd_jbuf, 1);
+ }
+}