linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

cmd: nvedit: set H_INTERACTIVE in do_env_default

Browse Source 
The function set_default_vars() in common.c adds H_INTERACTIVE to the
h_import() flag, but the function has no way of telling if the command
actually was user directed like this flag suggest. The flag should be
set by the calling function do_env_default() in nvedit.c instead, where
the command is certainty user directed.

Move the H_INTERACTIVE flag from set_default_vars() to do_env_default().

Signed-off-by: Yaniv Levinsky <yaniv.levinsky@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Yaniv Levinsky
2018-06-24 19:16:56 +03:00
committed by Tom Rini
parent 477f8116d5
commit 5a04264ecf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/nvedit.c
View File

@ -780,7 +780,7 @@ int envmatch(uchar *s1, int i2)
static int do_env_default(cmd_tbl_t *cmdtp, int flag, static int do_env_default(cmd_tbl_t *cmdtp, int flag,
int argc, char * const argv[]) int argc, char * const argv[])
{ {
int all = 0, env_flag = 0; int all = 0, env_flag = H_INTERACTIVE;
debug("Initial value for argc=%d\n", argc); debug("Initial value for argc=%d\n", argc);
while (--argc > 0 && **++argv == '-') { while (--argc > 0 && **++argv == '-') {

2
env/common.c vendored
View File

@ -97,7 +97,7 @@ int set_default_vars(int nvars, char * const vars[], int flags)
* Special use-case: import from default environment * Special use-case: import from default environment
* (and use \0 as a separator) * (and use \0 as a separator)
*/ */
flags |= H_NOCLEAR | H_INTERACTIVE; flags |= H_NOCLEAR;
return himport_r(&env_htab, (const char *)default_environment, return himport_r(&env_htab, (const char *)default_environment,
sizeof(default_environment), '\0', sizeof(default_environment), '\0',
flags, 0, nvars, vars); flags, 0, nvars, vars);