version 1.1.2.13, 2014/01/29 13:37:13
|
version 1.1.2.18, 2014/01/30 07:36:53
|
Line 1
|
Line 1
|
|
/************************************************************************* |
|
* (C) 2014 AITNET - Sofia/Bulgaria - <office@aitbg.com> |
|
* by Michael Pounov <misho@aitbg.com> |
|
* |
|
* $Author$ |
|
* $Id$ |
|
* |
|
************************************************************************* |
|
The ELWIX and AITNET software is distributed under the following |
|
terms: |
|
|
|
All of the documentation and software included in the ELWIX and AITNET |
|
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
|
Copyright 2004 - 2014 |
|
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
|
Redistribution and use in source and binary forms, with or without |
|
modification, are permitted provided that the following conditions |
|
are met: |
|
1. Redistributions of source code must retain the above copyright |
|
notice, this list of conditions and the following disclaimer. |
|
2. Redistributions in binary form must reproduce the above copyright |
|
notice, this list of conditions and the following disclaimer in the |
|
documentation and/or other materials provided with the distribution. |
|
3. All advertising materials mentioning features or use of this software |
|
must display the following acknowledgement: |
|
This product includes software developed by Michael Pounov <misho@elwix.org> |
|
ELWIX - Embedded LightWeight unIX and its contributors. |
|
4. Neither the name of AITNET nor the names of its contributors |
|
may be used to endorse or promote products derived from this software |
|
without specific prior written permission. |
|
|
|
THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND |
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
|
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
|
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
|
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
|
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
|
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
|
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
|
SUCH DAMAGE. |
|
*/ |
#include "global.h" |
#include "global.h" |
#include "ub_env.h" |
#include "ub_env.h" |
|
|
Line 9 ub_flash_io(const char *csSec, int mode)
|
Line 54 ub_flash_io(const char *csSec, int mode)
|
{ |
{ |
int f, l, rlen; |
int f, l, rlen; |
const char *str; |
const char *str; |
size_t siz, esiz; | ssize_t siz, esiz; |
ait_val_t v; |
ait_val_t v; |
u_int crc; |
u_int crc; |
|
|
Line 48 ub_flash_io(const char *csSec, int mode)
|
Line 93 ub_flash_io(const char *csSec, int mode)
|
} |
} |
|
|
if (mode & O_RDWR) { |
if (mode & O_RDWR) { |
env->env_crc = crc32(0, (u_char*) env->env_data, esiz); | env->env_crc = crc_32(0, (u_char*) env->env_data, esiz); |
| VERB(5) printf("Write CRC32 0x%x\n", env->env_crc); |
rlen = write(f, env, siz); |
rlen = write(f, env, siz); |
if (rlen != siz) |
if (rlen != siz) |
printf("Error:: written %d bytes != %d\n", rlen, siz); |
printf("Error:: written %d bytes != %d\n", rlen, siz); |
Line 63 ub_flash_io(const char *csSec, int mode)
|
Line 109 ub_flash_io(const char *csSec, int mode)
|
else |
else |
VERB(3) printf("Readed %d bytes\n", rlen); |
VERB(3) printf("Readed %d bytes\n", rlen); |
|
|
crc = crc32(0, (u_char*) env->env_data, esiz); | crc = crc_32(0, (u_char*) env->env_data, esiz); |
| VERB(5) printf("Calculated CRC32 0x%x\n", crc); |
if (crc != env->env_crc) |
if (crc != env->env_crc) |
VERB(1) printf("Warning:: Bad CRC, Flash crc32 0x%x != 0x%x\n", |
VERB(1) printf("Warning:: Bad CRC, Flash crc32 0x%x != 0x%x\n", |
env->env_crc, crc); |
env->env_crc, crc); |
Line 122 const char*
|
Line 169 const char*
|
ub_getenv(const char *csSec, const char *csName) |
ub_getenv(const char *csSec, const char *csName) |
{ |
{ |
char *e, *nxt; |
char *e, *nxt; |
size_t dlen; | size_t dlen = 0; |
const char *str = NULL; |
const char *str = NULL; |
|
|
FTRACE(3); |
FTRACE(3); |
Line 132 ub_getenv(const char *csSec, const char *csName)
|
Line 179 ub_getenv(const char *csSec, const char *csName)
|
str = cfg_getAttribute(&cfg, csSec, "drive_size"); |
str = cfg_getAttribute(&cfg, csSec, "drive_size"); |
if (!str) |
if (!str) |
return NULL; |
return NULL; |
|
dlen -= sizeof env->env_crc; |
} |
} |
dlen = strtol(str, NULL, 0); | dlen += strtol(str, NULL, 0); |
if (!dlen) |
if (!dlen) |
return NULL; |
return NULL; |
else |
else |
Line 158 int
|
Line 206 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; |
char *e, *nxt; |
size_t dlen, len; | ssize_t dlen = 0, len; |
const char *str, *old = NULL; |
const char *str, *old = NULL; |
|
|
FTRACE(3); |
FTRACE(3); |
Line 168 ub_setenv(const char *csSec, const char *csName, const
|
Line 216 ub_setenv(const char *csSec, const char *csName, const
|
str = cfg_getAttribute(&cfg, csSec, "drive_size"); |
str = cfg_getAttribute(&cfg, csSec, "drive_size"); |
if (!str) |
if (!str) |
return -1; |
return -1; |
|
dlen -= sizeof env->env_crc; |
} |
} |
dlen = strtol(str, NULL, 0); | dlen += strtol(str, NULL, 0); |
if (!dlen) |
if (!dlen) |
return -1; |
return -1; |
else |
else |
Line 206 ub_setenv(const char *csSec, const char *csName, const
|
Line 255 ub_setenv(const char *csSec, const char *csName, const
|
for (e = env->env_data; *e || *(e + 1); e++); |
for (e = env->env_data; *e || *(e + 1); e++); |
if (e > env->env_data) |
if (e > env->env_data) |
e++; |
e++; |
/* "name" + "=" + "val" +"\0\0" > u-boot-env size */ | /* "name" + "=" + "val" +"\0\0" check u-boot-env size */ |
len = strlen(csName) + 2; /* add '=' for first arg, ' ' for all others */ |
len = strlen(csName) + 2; /* add '=' for first arg, ' ' for all others */ |
len += strlen(csValue) + 1; |
len += strlen(csValue) + 1; |
if (len > env->env_data + dlen - e) { |
if (len > env->env_data + dlen - e) { |
Line 236 int
|
Line 285 int
|
ub_env(const char *csSec) |
ub_env(const char *csSec) |
{ |
{ |
char *e, *nxt; |
char *e, *nxt; |
size_t dlen; | ssize_t dlen = 0; |
const char *str; |
const char *str; |
|
|
FTRACE(3); |
FTRACE(3); |
Line 246 ub_env(const char *csSec)
|
Line 295 ub_env(const char *csSec)
|
str = cfg_getAttribute(&cfg, csSec, "drive_size"); |
str = cfg_getAttribute(&cfg, csSec, "drive_size"); |
if (!str) |
if (!str) |
return -1; |
return -1; |
|
dlen -= sizeof env->env_crc; |
} |
} |
dlen = strtol(str, NULL, 0); | dlen += strtol(str, NULL, 0); |
if (!dlen) |
if (!dlen) |
return -1; |
return -1; |
else |
else |