summaryrefslogtreecommitdiff
path: root/common/cli.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-07 13:59:43 -0600
committerTom Rini <trini@ti.com>2014-10-27 11:03:33 -0400
commit87b6398b46421c5dadacdda6b4be2d9d71588107 (patch)
tree8bccf0ee67b008451ede6289836c07bb956b3c45 /common/cli.c
parent0cf876154922118d8fb1b4c30f527c95a113bef3 (diff)
downloadu-boot-imx-87b6398b46421c5dadacdda6b4be2d9d71588107.zip
u-boot-imx-87b6398b46421c5dadacdda6b4be2d9d71588107.tar.gz
u-boot-imx-87b6398b46421c5dadacdda6b4be2d9d71588107.tar.bz2
cli: hush: Adjust 'run' command to run each line of the env var
The run command treats each argument an an environment variable. It gets the value of each variable and executes it as a command. If an environment variable contains a newline and the hush cli is used, it is supposed to execute each line one after the other. Normally a newline signals to hush to exit - this is used in normal command line entry - after a command is entered we want to return to allow the user to enter the next one. But environment variables obviously need to execute to completion. Add a special case for the execution of environment variables which continues when a newline is seen, and add a few tests to check this behaviour. Note: it's not impossible that this may cause regressions in other areas. I can't think of a case but with any change of behaviour with limited test coverage there is always a risk. From what I can tell this behaviour has been around since at least U-Boot 2011.03, although this pre-dates sandbox and I have not tested it on real hardware. Reported-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cli.c')
-rw-r--r--common/cli.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/common/cli.c b/common/cli.c
index 272b028..075ae9d 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -36,8 +36,11 @@ int run_command(const char *cmd, int flag)
return 0;
#else
- return parse_string_outer(cmd,
- FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP);
+ int hush_flags = FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP;
+
+ if (flag & CMD_FLAG_ENV)
+ hush_flags |= FLAG_CONT_ON_NEWLINE;
+ return parse_string_outer(cmd, hush_flags);
#endif
}
@@ -125,7 +128,7 @@ int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1;
}
- if (run_command(arg, flag) != 0)
+ if (run_command(arg, flag | CMD_FLAG_ENV) != 0)
return 1;
}
return 0;