X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/05437fb4cdb907816a4fc3ffafa2617fcf33266a..e1f1d450f138e5c16cfb4cd35437b9d360286037:/avr/cli.c diff --git a/avr/cli.c b/avr/cli.c index b310f79..77876af 100644 --- a/avr/cli.c +++ b/avr/cli.c @@ -1,3 +1,17 @@ +/* + * (C) Copyright 2014-2016 Leo C. + * + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * Add to readline cmdline-editing by + * (C) Copyright 2005 + * JinHua Luo, GuangDong Linux Center, + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include "cli.h" #include "common.h" #include @@ -12,7 +26,9 @@ #include "env.h" #include "cli_readline.h" #include "con-utils.h" -#include "cli.h" + + +/* FIXME: Quoting problems */ #define DEBUG_PARSER 0 /* set to 1 to debug */ @@ -21,26 +37,78 @@ 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'; (c = *inp) != '\0'; inp++) { - debug_parser("parse_line: \"%s\"\n", line); + switch (state) { + case 0: /* before arg string, waiting for arg start */ + if (isblank(c)) + continue; - ptr = strtok_P(line, delim); - while(nargs < CONFIG_SYS_MAXARGS && ptr != NULL) { - argv[nargs++] = ptr; - ptr = strtok_P(NULL, delim); + argv[nargs++] = inp; /* begin of argument string */ + outp = inp; + state = 1; + /* fall thru */ + + case 1: /* in arg string, waiting for end of arg string */ + if (c == '\\') { + ++state; + continue; + } + if (c == '\"' || c == '\'') { + quote = c; + state = 3; + continue; + } + if (isblank(c)) { + c = '\0'; + state = 0; + } + break; + + case 3: /* in quote */ + if (c == '\\' && quote == '\"') { + ++state; + continue; + } + if (c == quote) { + state = 1; + continue; + } + break; + + case 2: /* waiting for next char */ + case 4: + --state; + break; + + } + + if (nargs > CONFIG_SYS_MAXARGS) { + --nargs; + break; + } + *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 +129,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 +144,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,26 +158,26 @@ 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 } */ if (c == '}') { /* Terminate variable name */ *(inp-1) = '\0'; - const char *envval = getenv(varname); + const char *envval = getenv_str(varname); *(inp-1) = '}'; /* Copy into the line if it exists */ if (envval != NULL) @@ -126,15 +186,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); @@ -152,7 +210,7 @@ char *process_macros(char *input, char *output) * WARNING: * * We must create a temporary copy of the command since the command we get - * may be the result from getenv(), which returns a pointer directly to + * may be the result from getenv_str(), which returns a pointer directly to * the environment data, which may change magicly when the command we run * creates or modifies environment variables (like "bootp" does). * @@ -200,25 +258,29 @@ static int cli_run_command(const char *cmd, int flag) */ for (inquotes = 0, sep = str; *sep; sep++) { if ((*sep == '\'') && - (*(sep - 1) != '\\')) + (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); @@ -257,7 +319,7 @@ static int cli_run_command_list(const char *cmd) /* - * Run a command using the selected parser. + * Run a command. * * @param cmd Command to run * @param flag Execution flags (CMD_FLAG_...) @@ -305,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) { @@ -326,28 +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(argv[i]); - if (arg == NULL) { - printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]); - return CMD_RET_FAILURE; - } - - if (run_command(arg, flag) != 0) - return CMD_RET_FAILURE; - } - return CMD_RET_SUCCESS; -} -