--- embedtools/src/ub_env.c	2014/01/29 13:37:13	1.1.2.13
+++ embedtools/src/ub_env.c	2014/01/29 14:01:06	1.1.2.16
@@ -9,7 +9,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;
 
@@ -49,6 +49,7 @@ ub_flash_io(const char *csSec, int mode)
 
 	if (mode & O_RDWR) {
 		env->env_crc = crc32(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);
@@ -64,6 +65,7 @@ ub_flash_io(const char *csSec, int mode)
 		VERB(3) printf("Readed %d bytes\n", rlen);
 
 	crc = crc32(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:: Bad CRC, Flash crc32 0x%x != 0x%x\n", 
 				env->env_crc, crc);
@@ -122,7 +124,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);
@@ -132,8 +134,9 @@ ub_getenv(const char *csSec, const char *csName)
 		str = cfg_getAttribute(&cfg, csSec, "drive_size");
 		if (!str)
 			return NULL;
+		dlen -= sizeof env->env_crc;
 	}
-	dlen = strtol(str, NULL, 0);
+	dlen += strtol(str, NULL, 0);
 	if (!dlen)
 		return NULL;
 	else
@@ -158,7 +161,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);
@@ -168,8 +171,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
@@ -206,7 +210,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) {
@@ -236,7 +240,7 @@ int
 ub_env(const char *csSec)
 {
 	char *e, *nxt;
-	size_t dlen;
+	ssize_t dlen = 0;
 	const char *str;
 
 	FTRACE(3);
@@ -246,8 +250,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