Improved command line quoting

1 files changed, 73 insertions, 35 deletions

diff --git a/avr/cli.c b/avr/cli.c
index b310f79..046859c 100644
--- a/avr/cli.c
+++ b/avr/cli.c
@@ -21,26 +21,75 @@
 
 static int cli_parse_line(char *line, char *argv[])
 {
-	static const FLASH char delim[] = {" \t"};
-
-	char *ptr;
+	uint_fast8_t state = 0;
 	uint_fast8_t nargs = 0;
+	char *inp, *outp;
+	char c, quote;
+
+	debug_parser("%s: \"%s\"\n", __func__, line);
+
+	for (outp = inp = line, quote = '\0' ;
+			nargs < CONFIG_SYS_MAXARGS && (c = *inp) != '\0';
+			inp++) {
+
+		switch (state) {
+		case 0:
+			if (isblank(c))
+				continue;
+
+			argv[nargs++] = inp;	/* begin of argument string	*/
+			outp = inp;
+			state = 1;
+			/* fall thru */
+
+		case 1:
+			if (c == '\\') {
+				++state;
+				continue;
+			}
+			if (c == '\"' || c == '\'') {
+				quote = c;
+				state = 3;
+				continue;
+			}
+			if (isblank(c)) {
+				c = '\0';
+				state = 0;
+			}
+			break;
+
+		case 3:
+			if (c == '\\' && quote == '\"') {
+				++state;
+				continue;
+			}
+			if (c == quote) {
+				state = 1;
+				continue;
+			}
+			break;
 
-	debug_parser("parse_line: \"%s\"\n", line);
+		case 2:
+		case 4:
+			--state;
+			break;
 
-	ptr = strtok_P(line, delim);
-	while(nargs < CONFIG_SYS_MAXARGS && ptr != NULL) {
-		argv[nargs++] = ptr;
-	 	ptr = strtok_P(NULL, delim);
+		}
+		*outp++ = c;
 	}
 
-	if (ptr != NULL)
+	if (*inp != '\0')
 		printf_P(PSTR("** Too many args (max. %d) **\n"), CONFIG_SYS_MAXARGS);
 
+	*outp = '\0';
 	argv[nargs] = NULL;
-	debug_parser("parse_line: nargs=%d\n", nargs);
-
+	debug_parser("%s: nargs=%d\n", __func__, nargs);
+#if 0
+	for (int i = 0; i < nargs; i++)
+		debug_parser("%s: arg %d: >%s<\n", __func__, i, argv[i]);
+#endif
 	return nargs;
+
 }
 
 static
@@ -61,7 +110,8 @@ char *process_macros(char *input, char *output)
 
 	for(uint_fast8_t pass = 0; pass < 2; pass++)
 	{
-		uint_fast8_t state = 0;		/* 0 = waiting for '$'  */
+		uint_fast8_t state = 0;
+		/* 0 = waiting for '$'  */
 		/* 1 = waiting for '{' */
 		/* 2 = waiting for '}' */
 		/* 3 = waiting for ''' */
@@ -75,22 +125,13 @@ char *process_macros(char *input, char *output)
 		}
 
 		inp = input;
-		prev = '\0';		/* previous character   */
 
-		debug_parser("[PROCESS_MACROS] INPUT len %d: \"%s\"\n", strlen(inp),
-			     inp);
+		debug_parser("[PROCESS_MACROS] INPUT len %d: \"%s\"\n",
+						strlen(inp), inp);
+
+		for (prev = '\0'; (c = *inp++) != '\0'; prev = c) {
 
-		while ((c = *inp++) != '\0') {
 
-			if (state != 3) {
-				/* remove one level of escape characters */
-				if ((c == '\\') && (prev != '\\')) {
-					if (*inp == '\0')
-						break;
-					prev = c;
-					c = *inp++;
-				}
-			}
 
 			switch (state) {
 			case 0:	/* Waiting for (unescaped) $    */
@@ -98,19 +139,19 @@ char *process_macros(char *input, char *output)
 					state = 3;
 					break;
 				}
-				if ((c == '$') && (prev != '\\'))
+				if ((c == '$') && (prev != '\\')) {
 					state++;
-				else
-					append_char(pass, &outp, c);
+					continue;
+				}
 				break;
 			case 1:	/* Waiting for {        */
 				if (c == '{') {
 					state++;
 					varname = inp;
+					continue;
 				} else {
 					state = 0;
 					append_char(pass, &outp, '$');
-					append_char(pass, &outp, c);
 				}
 				break;
 			case 2:	/* Waiting for }        */
@@ -126,15 +167,13 @@ char *process_macros(char *input, char *output)
 					/* Look for another '$' */
 					state = 0;
 				}
-				break;
+				continue;
 			case 3:	/* Waiting for '        */
-				if ((c == '\'') && (prev != '\\'))
+				if (c == '\'')
 					state = 0;
-				else
-					append_char(pass, &outp, c);
 				break;
 			}
-			prev = c;
+			append_char(pass, &outp, c);
 		}
 
 		append_char(pass, &outp, 0);
@@ -350,4 +389,3 @@ command_ret_t do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	}
 	return CMD_RET_SUCCESS;
 }
-