X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/d0581f881c4072ef0ac453167a98dc3bc0d87d86..fecee2418b6aea15008ed6d3a856d202d59a5cdb:/avr/command.c

diff --git a/avr/command.c b/avr/command.c
index 9eb0ed2..46e3a8a 100644
--- a/avr/command.c
+++ b/avr/command.c
@@ -1,33 +1,39 @@
+/*
+ * (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--)
-		my_puts_P(PSTR(" "));
-}
-
-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"));
@@ -37,7 +43,7 @@ int strcmp_PP(const FLASH char *s1, const FLASH char *s2)
 {
 	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;
@@ -45,9 +51,9 @@ int strcmp_PP(const FLASH char *s1, const FLASH char *s2)
 	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);
 }
 
@@ -70,7 +76,7 @@ int cmd_tbl_item_count(void)
 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;
+	uint_fast8_t i, max_len = 0;
 	command_ret_t rcode = CMD_RET_SUCCESS;
 
 	(void) flag;
@@ -83,10 +89,13 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 		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++) {
@@ -97,10 +106,10 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 				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
 		}
@@ -140,8 +149,8 @@ cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
 	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 ? */
@@ -165,10 +174,10 @@ cmd_tbl_t *find_cmd (const char *cmd)
 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"));
@@ -194,7 +203,7 @@ command_ret_t cmd_usage(const FLASH cmd_tbl_t *cmdtp)
 
 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 +219,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 +368,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;