X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/1b77fa4e36e50258936a4b61fdb11a988d473b1a..ef77033ca52647599df6c9053d073216d439780c:/avr/cli.c

diff --git a/avr/cli.c b/avr/cli.c
index 8763ed1..1a26206 100644
--- a/avr/cli.c
+++ b/avr/cli.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014-2016 Leo C. <erbl259-lmu@yahoo.de>
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -8,9 +8,10 @@
  * (C) Copyright 2005
  * JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
+ * SPDX-License-Identifier:	GPL-2.0
  */
 
+#include "cli.h"
 #include "common.h"
 
 #include <string.h>
@@ -25,7 +26,6 @@
 #include "env.h"
 #include "cli_readline.h"
 #include "con-utils.h"
-#include "cli.h"
 
 
 /* FIXME: Quoting problems */
@@ -258,26 +258,29 @@ static int cli_run_command(const char *cmd, int flag)
 		 */
 		for (inquotes = 0, sep = str; *sep; sep++) {
 			if ((*sep == '\'') &&
-			    (sep != str) &&				/* past string start */
-			    (*(sep - 1) != '\\'))		/* and NOT escaped */
+			    (sep != str) &&					/* past string start */
+			    (*(sep - 1) != '\\'))			/* and NOT escaped */
 				inquotes = !inquotes;
 
 			if (!inquotes &&
-			    (*sep == ';' || *sep == '\n') &&	/* separator */
-			    (sep != str) &&				/* past string start */
-			    (*(sep - 1) != '\\'))		/* and NOT escaped */
+			    (*sep == ';' || *sep == '\n'	/* separator */
+					|| *sep == '#') &&			/*   or start of comment */
+			    ((sep == str) ||				/* string start */
+			    (*(sep - 1) != '\\')))			/*   or NOT escaped */
 				break;
 		}
 
-		/*
-		 * Limit the token to data between separators
-		 */
+		/* no more commands after unescaped '#' token */
+		if (*sep == '#')
+			*sep = '\0';
+
+		/* Limit the token to data between separators */
 		token = str;
 		if (*sep) {
-			str = sep + 1;	/* start of command for next pass */
+			str = sep + 1;		/* start of command for next pass */
 			*sep = '\0';
 		} else {
-			str = sep;	/* no more commands for next pass */
+			str = sep;			/* no more commands for next pass */
 		}
 		debug_parser("token: \"%s\"\n", token);
 
@@ -364,7 +367,7 @@ void cli_loop(void)
 	int rc = 1;
 
 	for (;;) {
-		len = cli_readline(PSTR(CONFIG_SYS_PROMPT));
+		len = cli_readline(PSTR(CONFIG_SYS_PROMPT), 1);
 
 		flag = 0;	/* assume no special flags for now */
 		if (len > 0) {
@@ -385,27 +388,3 @@ void cli_loop(void)
 		}
 	}
 }
-
-
-command_ret_t do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	int i;
-	(void) cmdtp;
-
-	if (argc < 2)
-		return CMD_RET_USAGE;
-
-	for (i = 1; i < argc; ++i) {
-		char *arg;
-
-		arg = getenv_char(argv[i]);
-		if (arg == NULL) {
-			printf_P(PSTR("## Error: \"%s\" is not set\n"), argv[i]);
-			return CMD_RET_FAILURE;
-		}
-
-		if (run_command(arg, flag) != 0)
-			return CMD_RET_FAILURE;
-	}
-	return CMD_RET_SUCCESS;
-}