--- embedtools/src/ub_env.c	2014/01/29 13:31:13	1.1.2.12
+++ embedtools/src/ub_env.c	2014/01/29 13:46:16	1.1.2.14
@@ -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;
 
@@ -48,6 +48,7 @@ ub_flash_io(const char *csSec, int mode)
 	}
 
 	if (mode & O_RDWR) {
+		env->env_crc = crc32(0, (u_char*) env->env_data, esiz);
 		rlen = write(f, env, siz);
 		if (rlen != siz)
 			printf("Error:: written %d bytes != %d\n", rlen, siz);
@@ -64,8 +65,8 @@ ub_flash_io(const char *csSec, int mode)
 
 	crc = crc32(0, (u_char*) env->env_data, esiz);
 	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 +122,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 +131,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 +159,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 +169,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
@@ -235,7 +238,7 @@ int
 ub_env(const char *csSec)
 {
 	char *e, *nxt;
-	size_t dlen;
+	ssize_t dlen = 0;
 	const char *str;
 
 	FTRACE(3);
@@ -245,8 +248,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