--- embedtools/src/ub_env.c 2014/01/29 13:31:13 1.1.2.12 +++ embedtools/src/ub_env.c 2014/01/30 07:36:53 1.1.2.18 @@ -1,3 +1,48 @@ +/************************************************************************* + * (C) 2014 AITNET - Sofia/Bulgaria - + * by Michael Pounov + * + * $Author: misho $ + * $Id: ub_env.c,v 1.1.2.18 2014/01/30 07:36:53 misho Exp $ + * + ************************************************************************* +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 + +Copyright 2004 - 2014 + by Michael Pounov . 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 +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 "ub_env.h" @@ -9,7 +54,7 @@ ub_flash_io(const char *csSec, int mode) { int f, l, rlen; const char *str; - size_t siz, esiz; + ssize_t siz, esiz; ait_val_t v; u_int crc; @@ -48,6 +93,8 @@ ub_flash_io(const char *csSec, int mode) } if (mode & O_RDWR) { + 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); if (rlen != siz) printf("Error:: written %d bytes != %d\n", rlen, siz); @@ -62,10 +109,11 @@ ub_flash_io(const char *csSec, int mode) else 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) - VERB(1) printf("Warning:: Flash crc32 0x%x != 0x%x - " - "Bad CRC, using default environment\n", env->env_crc, crc); + VERB(1) printf("Warning:: Bad CRC, Flash crc32 0x%x != 0x%x\n", + env->env_crc, crc); close(f); close(l); @@ -121,7 +169,7 @@ const char* ub_getenv(const char *csSec, const char *csName) { char *e, *nxt; - size_t dlen; + size_t dlen = 0; const char *str = NULL; FTRACE(3); @@ -130,9 +178,10 @@ ub_getenv(const char *csSec, const char *csName) if (!str) { str = cfg_getAttribute(&cfg, csSec, "drive_size"); if (!str) - return -1; + return NULL; + dlen -= sizeof env->env_crc; } - dlen = strtol(str, NULL, 0); + dlen += strtol(str, NULL, 0); if (!dlen) return NULL; else @@ -157,7 +206,7 @@ int ub_setenv(const char *csSec, const char *csName, const char *csValue) { char *e, *nxt; - size_t dlen, len; + ssize_t dlen = 0, len; const char *str, *old = NULL; FTRACE(3); @@ -167,8 +216,9 @@ ub_setenv(const char *csSec, const char *csName, const str = cfg_getAttribute(&cfg, csSec, "drive_size"); if (!str) return -1; + dlen -= sizeof env->env_crc; } - dlen = strtol(str, NULL, 0); + dlen += strtol(str, NULL, 0); if (!dlen) return -1; else @@ -205,7 +255,7 @@ ub_setenv(const char *csSec, const char *csName, const for (e = env->env_data; *e || *(e + 1); e++); if (e > env->env_data) 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(csValue) + 1; if (len > env->env_data + dlen - e) { @@ -235,7 +285,7 @@ int ub_env(const char *csSec) { char *e, *nxt; - size_t dlen; + ssize_t dlen = 0; const char *str; FTRACE(3); @@ -245,8 +295,9 @@ ub_env(const char *csSec) str = cfg_getAttribute(&cfg, csSec, "drive_size"); if (!str) return -1; + dlen -= sizeof env->env_crc; } - dlen = strtol(str, NULL, 0); + dlen += strtol(str, NULL, 0); if (!dlen) return -1; else