version 1.1.2.10, 2014/01/29 01:40:35
|
version 1.1.2.11, 2014/01/29 10:19:48
|
Line 67 ub_flash_io(const char *csSec, int mode)
|
Line 67 ub_flash_io(const char *csSec, int mode)
|
static inline const char * |
static inline const char * |
ub_envmatch(const char *csName, const char *e) |
ub_envmatch(const char *csName, const char *e) |
{ |
{ |
const char *str = NULL; |
|
|
|
while (*csName == *e++) |
while (*csName == *e++) |
if (*csName++ == '=') |
if (*csName++ == '=') |
return e; |
return e; |
Line 116 ub_getenv(const char *csSec, const char *csName)
|
Line 114 ub_getenv(const char *csSec, const char *csName)
|
size_t dlen; |
size_t dlen; |
const char *str = NULL; |
const char *str = NULL; |
|
|
|
|
FTRACE(3); |
FTRACE(3); |
|
|
str = cfg_getAttribute(&cfg, csSec, "size"); |
str = cfg_getAttribute(&cfg, csSec, "size"); |
|
if (!str) |
|
return NULL; |
dlen = strtol(str, NULL, 0); |
dlen = strtol(str, NULL, 0); |
if (!dlen) |
if (!dlen) |
return NULL; |
return NULL; |
Line 144 ub_getenv(const char *csSec, const char *csName)
|
Line 143 ub_getenv(const char *csSec, const char *csName)
|
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; |
return 0; |
} |
} |
|
|
Line 159 ub_env(const char *csSec)
|
Line 225 ub_env(const char *csSec)
|
FTRACE(3); |
FTRACE(3); |
|
|
str = cfg_getAttribute(&cfg, csSec, "size"); |
str = cfg_getAttribute(&cfg, csSec, "size"); |
|
if (!str) |
|
return -1; |
dlen = strtol(str, NULL, 0); |
dlen = strtol(str, NULL, 0); |
if (!dlen) |
if (!dlen) |
return -1; |
return -1; |