Autocomplete, long way to go...

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

diff --git a/avr/command.c b/avr/command.c
index 89e88695c2289a5684cfc23f2faae05b3a3a80bb..15b1c7299b65c9d2b372ca61a9bf67785456a873 100644 (file)
--- a/avr/command.c
+++ b/avr/command.c
@@ -21,7 +21,7 @@
 static void print_blanks(int_fast8_t count)
 {
        while(count--)
-               putchar(' ');
+               my_puts_P(PSTR(" "));
 }
 
 static void print_usage_line(const FLASH char *name, const FLASH char *usage)
@@ -67,11 +67,11 @@ int cmd_tbl_item_count(void)
  * 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;
+       command_ret_t rcode = CMD_RET_SUCCESS;
 
        (void) flag;
 
@@ -94,7 +94,7 @@ int _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 
                        /* allow user abort */
                        if (ctrlc ())
-                               return 1;
+                               return CMD_RET_FAILURE;
                        if (usage == NULL)
                                continue;
 #ifdef GCC_BUG_61443 
@@ -104,19 +104,19 @@ int _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
                                        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);
+                       rcode = 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;
@@ -162,7 +162,7 @@ cmd_tbl_t *find_cmd (const char *cmd)
 }
 
 
-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);
@@ -177,24 +177,24 @@ int cmd_usage(const FLASH cmd_tbl_t *cmdtp)
 //     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);
@@ -210,6 +210,8 @@ int var_complete(int argc, char * const argv[], char last_char, int maxv, 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;
@@ -357,6 +359,7 @@ static int find_common_prefix(char * const argv[])
 
 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;
@@ -459,31 +462,31 @@ int cmd_auto_complete(const FLASH char *const prompt, char *buf, int *np, int *c
  * @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 */