minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 05:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

env: Add setenv force support

Browse Source 
Now that we have support for permissions, add a way to override them.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2012-12-11 22:16:35 -06:00 committed by Tom Rini
parent 267541f776
commit 24ab5a1914
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/cmd_nvedit.c
View File

@ -200,7 +200,24 @@ static int _do_env_set(int flag, int argc, char * const argv[])
int i, len; int i, len;
char *name, *value, *s; char *name, *value, *s;
ENTRY e, *ep; ENTRY e, *ep;
int env_flag = H_INTERACTIVE;
debug("Initial value for argc=%d\n", argc);
while (argc > 1 && **(argv + 1) == '-') {
char *arg = *++argv;
--argc;
while (*++arg) {
switch (*arg) {
case 'f': /* force */
env_flag |= H_FORCE;
break;
default:
return CMD_RET_USAGE;
}
}
}
debug("Final value for argc=%d\n", argc);
name = argv[1]; name = argv[1];
value = argv[2]; value = argv[2];
@ -214,7 +231,7 @@ static int _do_env_set(int flag, int argc, char * const argv[])
/* Delete only ? */ /* Delete only ? */
if (argc < 3 || argv[2] == NULL) { if (argc < 3 || argv[2] == NULL) {
int rc = hdelete_r(name, &env_htab, H_INTERACTIVE); int rc = hdelete_r(name, &env_htab, env_flag);
return !rc; return !rc;
} }
@ -241,7 +258,7 @@ static int _do_env_set(int flag, int argc, char * const argv[])
e.key = name; e.key = name;
e.data = value; e.data = value;
hsearch_r(e, ENTER, &ep, &env_htab, H_INTERACTIVE); hsearch_r(e, ENTER, &ep, &env_htab, env_flag);
free(value); free(value);
if (!ep) { if (!ep) {
printf("## Error inserting \"%s\" variable, errno=%d\n", printf("## Error inserting \"%s\" variable, errno=%d\n",
@ -1109,10 +1126,10 @@ U_BOOT_CMD_COMPLETE(
U_BOOT_CMD_COMPLETE( U_BOOT_CMD_COMPLETE(
setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, setenv, CONFIG_SYS_MAXARGS, 0, do_env_set,
"set environment variables", "set environment variables",
"name value ...\n" "[-f] name value ...\n"
" - set environment variable 'name' to 'value ...'\n" " - [forcibly] set environment variable 'name' to 'value ...'\n"
"setenv name\n" "setenv [-f] name\n"
" - delete environment variable 'name'", " - [forcibly] delete environment variable 'name'",
var_complete var_complete
); );