version 1.1.2.7, 2014/01/28 23:04:42
|
version 1.1.2.11, 2014/01/29 10:19:48
|
Line 26 ub_flash_io(const char *csSec, int mode)
|
Line 26 ub_flash_io(const char *csSec, int mode)
|
} |
} |
|
|
cfg_loadAttribute(&cfg, "ube", "lock", &v, UBE_LOCK); |
cfg_loadAttribute(&cfg, "ube", "lock", &v, UBE_LOCK); |
l = open(AIT_GET_STR(&v), 0644, O_CREAT | O_EXCL | O_WRONLY); | l = open(AIT_GET_STR(&v), O_CREAT | O_EXCL | O_WRONLY, 0644); |
if (l == -1) { |
if (l == -1) { |
printf("Error:: Locked u-boot-env map!\n"); | printf("Error:: Locked u-boot-env map %s\n", AIT_GET_STR(&v)); |
AIT_FREE_VAL(&v); |
AIT_FREE_VAL(&v); |
return -1; |
return -1; |
} |
} |
Line 64 ub_flash_io(const char *csSec, int mode)
|
Line 64 ub_flash_io(const char *csSec, int mode)
|
return 0; |
return 0; |
} |
} |
|
|
|
static inline const char * |
|
ub_envmatch(const char *csName, const char *e) |
|
{ |
|
while (*csName == *e++) |
|
if (*csName++ == '=') |
|
return e; |
|
if (!*csName && *(e - 1) == '=') |
|
return e; |
|
|
|
return NULL; |
|
} |
|
|
int |
int |
ub_load(const char *csSec) |
ub_load(const char *csSec) |
{ |
{ |
Line 98 ub_unload()
|
Line 110 ub_unload()
|
const char* |
const char* |
ub_getenv(const char *csSec, const char *csName) |
ub_getenv(const char *csSec, const char *csName) |
{ |
{ |
|
char *e, *nxt; |
|
size_t dlen; |
const char *str = NULL; |
const char *str = NULL; |
|
|
FTRACE(3); |
FTRACE(3); |
|
|
|
str = cfg_getAttribute(&cfg, csSec, "size"); |
|
if (!str) |
|
return NULL; |
|
dlen = strtol(str, NULL, 0); |
|
if (!dlen) |
|
return NULL; |
|
else |
|
dlen--; |
|
|
|
for (e = env->env_data; *e; e = nxt + 1) { |
|
for (nxt = e; *nxt; nxt++) |
|
if (nxt >= env->env_data + dlen) { |
|
printf("Error:: environment not terminated\n"); |
|
return NULL; |
|
} |
|
|
|
str = ub_envmatch(csName, e); |
|
if (str) |
|
break; |
|
} |
|
|
return str; |
return str; |
} |
} |
|
|
int |
int |
ub_setenv(const char *csSec, const char *csName, const char *csValue) |
ub_setenv(const char *csSec, const char *csName, const char *csValue) |
{ |
{ |
|
char *e, *nxt; |
|
size_t dlen, len; |
|
const char *str, *old = NULL; |
|
|
FTRACE(3); |
FTRACE(3); |
|
|
|
str = cfg_getAttribute(&cfg, csSec, "size"); |
|
if (!str) |
|
return -1; |
|
dlen = strtol(str, NULL, 0); |
|
if (!dlen) |
|
return -1; |
|
else |
|
dlen--; |
|
|
|
for (e = env->env_data; *e; e = nxt + 1) { |
|
for (nxt = e; *nxt; nxt++) |
|
if (nxt >= env->env_data + dlen) { |
|
printf("Error:: environment not terminated\n"); |
|
return -1; |
|
} |
|
|
|
old = ub_envmatch(csName, e); |
|
if (old) |
|
break; |
|
} |
|
|
|
/* Delete any existing definition */ |
|
if (old) { |
|
if (!*++nxt) |
|
*e = 0; |
|
else |
|
while (42) { |
|
*e = *nxt++; |
|
if (!*e && !*nxt) |
|
break; |
|
e++; |
|
} |
|
*++e = 0; |
|
} |
|
|
|
if (csValue) { |
|
/* Append new definition at the end */ |
|
for (e = env->env_data; *e || *(e + 1); e++); |
|
if (e > env->env_data) |
|
e++; |
|
/* "name" + "=" + "val" +"\0\0" > u-boot-env size */ |
|
len = strlen(csName) + 2; /* add '=' for first arg, ' ' for all others */ |
|
len += strlen(csValue) + 1; |
|
if (len > env->env_data + dlen - e) { |
|
printf("Error:: Environment overflow!\n"); |
|
return -1; |
|
} |
|
|
|
/* av pair */ |
|
while ((*e = *csName++)) |
|
e++; |
|
*e = '='; |
|
while ((*++e = *csValue++)); |
|
|
|
/* end is marked with double '\0' */ |
|
*++e = 0; |
|
} |
|
|
|
if (ub_flash_io(csSec, O_RDWR)) { |
|
printf("Error:: Can't write environment to flash!\n"); |
|
return -1; |
|
} |
|
|
|
return 0; |
|
} |
|
|
|
int |
|
ub_env(const char *csSec) |
|
{ |
|
char *e, *nxt; |
|
size_t dlen; |
|
const char *str; |
|
|
|
FTRACE(3); |
|
|
|
str = cfg_getAttribute(&cfg, csSec, "size"); |
|
if (!str) |
|
return -1; |
|
dlen = strtol(str, NULL, 0); |
|
if (!dlen) |
|
return -1; |
|
else |
|
dlen--; |
|
|
|
for (e = env->env_data; *e; e = nxt + 1) { |
|
for (nxt = e; *nxt; nxt++) |
|
if (nxt >= env->env_data + dlen) { |
|
printf("Error:: environment not terminated\n"); |
|
return -1; |
|
} |
|
|
|
printf("%s\n", e); |
|
} |
|
|
return 0; |
return 0; |
} |
} |