--- embedtools/src/ube.c	2014/01/28 22:22:34	1.1.2.6
+++ embedtools/src/ube.c	2014/01/30 01:03:25	1.1.2.10
@@ -1,3 +1,48 @@
+/*************************************************************************
+ * (C) 2014 AITNET - Sofia/Bulgaria - <office@aitbg.com>
+ *  by Michael Pounov <misho@aitbg.com>
+ *
+ * $Author: misho $
+ * $Id: ube.c,v 1.1.2.10 2014/01/30 01:03:25 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 <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 "ub_env.h"
 
@@ -73,17 +118,18 @@ main(int argc, char **argv)
 	}
 
 	if (ub_load(szSec)) {
-		cfgUnloadConfig(&cfg);
-		return 1;
+		ret = 1;
+		goto end;
 	}
 
 	if (!(mode & 0x7f)) {
 		VERB(2) printf("u-boot-env: list variables\n");
+		ub_env(szSec);
 	}
 
 	if ((mode & 0x7f) & 1) {
 		VERB(2) printf("u-boot-env: get variable %s\n", szName);
-		str = ub_getenv(szName);
+		str = ub_getenv(szSec, szName);
 		if (!str) {
 			printf("Error:: Variable %s not found!\n", szName);
 			ret = 2;
@@ -91,12 +137,12 @@ main(int argc, char **argv)
 		} else if (mode & 0x80)
 			printf("%s\n", str);
 		else
-			printf("Variable %s=%s\n", szName, str);
+			printf("%s=%s\n", szName, str);
 	}
 
 	if ((mode & 0x7f) & 2) {
 		VERB(2) printf("u-boot-env: set variable %s\n", szName);
-		ret = ub_setenv(szName, argc ? szVal : NULL);
+		ret = ub_setenv(szSec, szName, argc ? szVal : NULL);
 		if (ret) {
 			printf("Error:: Writing variable %s!\n", szName);
 			ret = 3;