Command usage cleanup

[u-boot.git] / common / command.c

diff --git a/common/command.c b/common/command.c
index aca57b26be5e58235498a6e4df487c437db972d4..3b9ccc9ed086e70e7f1cc375058810dfb7b5179f 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -38,7 +38,7 @@ do_version (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        version,        1,              1,      do_version,
-       "version - print monitor version\n",
+       "print monitor version",
        NULL
 );
 
@@ -70,15 +70,15 @@ do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(
-       echo,   CFG_MAXARGS,    1,      do_echo,
-       "echo    - echo args to console\n",
+       echo,   CONFIG_SYS_MAXARGS,     1,      do_echo,
+       "echo args to console",
        "[args..]\n"
        "    - echo args to console; \\c suppresses newline\n"
 );
 
 #endif
 
-#ifdef CFG_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
 
 int
 do_test (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -202,8 +202,8 @@ do_test (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(
-       test,   CFG_MAXARGS,    1,      do_test,
-       "test    - minimal test like /bin/sh\n",
+       test,   CONFIG_SYS_MAXARGS,     1,      do_test,
+       "minimal test like /bin/sh",
        "[args..]\n"
        "    - test functionality\n"
 );
@@ -222,7 +222,7 @@ do_exit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        exit,   2,      1,      do_exit,
-       "exit    - exit script\n",
+       "exit script",
        "    - exit functionality\n"
 );
 
@@ -277,7 +277,8 @@ int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                                return 1;
                        if (usage == NULL)
                                continue;
-                       puts (usage);
+                       printf("%-*s- %s\n", CONFIG_SYS_HELP_CMD_WIDTH,
+                              cmd_array[i]->name, usage);
                }
                return 0;
        }
@@ -286,7 +287,7 @@ int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
         */
        for (i = 1; i < argc; ++i) {
                if ((cmdtp = find_cmd (argv[i])) != NULL) {
-#ifdef CFG_LONGHELP
+#ifdef CONFIG_SYS_LONGHELP
                        /* found - print (long) help info */
                        puts (cmdtp->name);
                        putc (' ');
@@ -299,8 +300,8 @@ int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        putc ('\n');
 #else  /* no long help available */
                        if (cmdtp->usage)
-                               puts (cmdtp->usage);
-#endif /* CFG_LONGHELP */
+                               printf ("%s - %s\n", cmdtp->name, cmdtp->usage);
+#endif /* CONFIG_SYS_LONGHELP */
                } else {
                        printf ("Unknown command '%s' - try 'help'"
                                " without arguments for list of all"
@@ -314,8 +315,8 @@ int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 
 U_BOOT_CMD(
-       help,   CFG_MAXARGS,    1,      do_help,
-       "help    - print online help\n",
+       help,   CONFIG_SYS_MAXARGS,     1,      do_help,
+       "print online help",
        "[command ...]\n"
        "    - show help information (for 'command')\n"
        "'help' prints online help for the monitor commands.\n\n"
@@ -325,26 +326,26 @@ U_BOOT_CMD(
 );
 
 /* This do not ust the U_BOOT_CMD macro as ? can't be used in symbol names */
-#ifdef  CFG_LONGHELP
+#ifdef  CONFIG_SYS_LONGHELP
 cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {
-       "?",    CFG_MAXARGS,    1,      do_help,
-       "?       - alias for 'help'\n",
+       "?",    CONFIG_SYS_MAXARGS,     1,      do_help,
+       "alias for 'help'",
        NULL
 };
 #else
 cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {
-       "?",    CFG_MAXARGS,    1,      do_help,
-       "?       - alias for 'help'\n"
+       "?",    CONFIG_SYS_MAXARGS,     1,      do_help,
+       "alias for 'help'"
 };
-#endif /* CFG_LONGHELP */
+#endif /* CONFIG_SYS_LONGHELP */
 
 /***************************************************************************
  * find command table entry for a command
  */
-cmd_tbl_t *find_cmd (const char *cmd)
+cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
 {
        cmd_tbl_t *cmdtp;
-       cmd_tbl_t *cmdtp_temp = &__u_boot_cmd_start;    /*Init value */
+       cmd_tbl_t *cmdtp_temp = table;  /*Init value */
        const char *p;
        int len;
        int n_found = 0;
@@ -355,8 +356,8 @@ cmd_tbl_t *find_cmd (const char *cmd)
         */
        len = ((p = strchr(cmd, '.')) == NULL) ? strlen (cmd) : (p - cmd);
 
-       for (cmdtp = &__u_boot_cmd_start;
-            cmdtp != &__u_boot_cmd_end;
+       for (cmdtp = table;
+            cmdtp != table + table_len;
             cmdtp++) {
                if (strncmp (cmd, cmdtp->name, len) == 0) {
                        if (len == strlen (cmdtp->name))
@@ -373,6 +374,17 @@ cmd_tbl_t *find_cmd (const char *cmd)
        return NULL;    /* not found or ambiguous command */
 }
 
+cmd_tbl_t *find_cmd (const char *cmd)
+{
+       int len = &__u_boot_cmd_end - &__u_boot_cmd_start;
+       return find_cmd_tbl(cmd, &__u_boot_cmd_start, len);
+}
+
+void cmd_usage(cmd_tbl_t *cmdtp)
+{
+       printf("Usage:\n%s - %s\n\n", cmdtp->name, cmdtp->usage);
+}
+
 #ifdef CONFIG_AUTO_COMPLETE
 
 int var_complete(int argc, char *argv[], char last_char, int maxv, char *cmdv[])
@@ -564,12 +576,12 @@ static int find_common_prefix(char *argv[])
        return len;
 }
 
-static char tmp_buf[CFG_CBSIZE];       /* copy of console I/O buffer   */
+static char tmp_buf[CONFIG_SYS_CBSIZE];        /* copy of console I/O buffer   */
 
 int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
 {
        int n = *np, col = *colp;
-       char *argv[CFG_MAXARGS + 1];            /* NULL terminated      */
+       char *argv[CONFIG_SYS_MAXARGS + 1];             /* NULL terminated      */
        char *cmdv[20];
        char *s, *t;
        const char *sep;
@@ -577,7 +589,7 @@ int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
        int cnt;
        char last_char;
 
-       if (strcmp(prompt, CFG_PROMPT) != 0)
+       if (strcmp(prompt, CONFIG_SYS_PROMPT) != 0)
                return 0;       /* not in normal console */
 
        cnt = strlen(buf);
@@ -625,7 +637,7 @@ int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
        if (s != NULL) {
                k = len + seplen;
                /* make sure it fits */
-               if (n + k >= CFG_CBSIZE - 2) {
+               if (n + k >= CONFIG_SYS_CBSIZE - 2) {
                        putc('\a');
                        return 1;
                }