Remove cruft

[z180-stamp.git] / avr / command.c

diff --git a/avr/command.c b/avr/command.c
index 085dfdc8f2e7a5ce2dd693a1f7c868b5a1b4c57f..b11297bb9c9d80578cdac0f327dc8478897a79f2 100644 (file)
--- a/avr/command.c
+++ b/avr/command.c
@@ -31,17 +31,15 @@
 jmp_buf cmd_jbuf;
 
 
-static void print_usage_line(const FLASH char *name, int width,
-                               const FLASH char *usage)
+static void print_usage_line(cmd_tbl_t *p, int width)
 {
-       width -= strlen_P(name);
+       width -= strlen_P(p->name);
        if (width < 0)
                width = 0;
-       my_puts_P(name);
+       my_puts_P(p->name);
        print_blanks(width);
        my_puts_P(PSTR(" - "));
-       my_puts_P(usage);
-       my_puts_P(PSTR("\n"));
+       puts_P(p->usage);
 }
 
 int strcmp_PP(const FLASH char *s1, const FLASH char *s2)
@@ -148,6 +146,7 @@ cmd_tbl_t *find_cmd (const char *cmd, cmd_tbl_t *table)
 command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
        cmd_tbl_t *tbl_start = get_cmd_tbl_base(cmdtp);
+       command_ret_t rc = CMD_RET_SUCCESS;
 
        char *optenv = getenv_str(PSTR("cmd"));
        bool opt_debug = optenv && strstr_P(optenv, PSTR("debug")) != NULL;
@@ -186,26 +185,21 @@ command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag UNUSED, int argc, char
 
                /* print short help (usage) */
                for (int i = 0; i < cmd_items; i++) {
-                       if (opt_debug || !(cmd_list[i]->flags & CTBL_DBG)) {
-                               const FLASH char *usage = cmd_list[i]->usage;
+                       if ((cmd_list[i]->flags & CTBL_DBG) && !opt_debug)
+                               continue;
+                       if (cmd_list[i]->usage == NULL)
+                               continue;
 
-                               /* allow user abort */
-                               if (ctrlc ()) {
-                                       free(cmd_list);
-                                       return CMD_RET_FAILURE;
-                               }
-                               if (usage == NULL)
-                                       continue;
-#if defined(GCC_BUG_61443) || 1
-                               print_usage_line(cmd_list[i]->name, maxlen_cmd, usage);
-#else
-                               printf_P(PSTR("%-" stringify(8) /*FIXME*/ "S - %S\n"),
-                                               cmd_list[i]->name, usage);
-#endif
+                       print_usage_line(cmd_list[i], maxlen_cmd);
+
+                       /* allow user abort */
+                       if (ctrlc ()) {
+                               rc = CMD_RET_FAILURE;
+                               break;
                        }
                }
                free(cmd_list);
-               return CMD_RET_SUCCESS;
+               return rc;
        }
 
        /*
@@ -228,28 +222,16 @@ command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag UNUSED, int argc, char
 
 command_ret_t cmd_usage(cmd_tbl_t *cmdtp)
 {
-//     printf("%s - %s\n\n", cmdtp->name, cmdtp->usage);
-       print_usage_line(cmdtp->name, 0, cmdtp->usage);
-#if 0
-       my_puts_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"));
-#endif
+       print_usage_line(cmdtp, 0);
 #ifdef CONFIG_SYS_LONGHELP
-//     printf("Usage:\n%s ", cmdtp->name);
        my_puts_P(PSTR("Usage:\n"));
        my_puts_P(cmdtp->name);
        my_puts_P(PSTR(" "));
 
-       if (!cmdtp->help) {
+       if (cmdtp->help && *cmdtp->help != '\0')
+               puts_P(cmdtp->help);
+       else
                my_puts_P(PSTR(" - No additional help available.\n"));
-               return CMD_RET_FAILURE;
-       }
-
-       my_puts_P(cmdtp->help);
-       my_puts_P(PSTR("\n"));
 #endif /* CONFIG_SYS_LONGHELP */
        return CMD_RET_FAILURE;
 }