--- embedtools/src/ube.c	2014/01/28 22:03:01	1.1.2.4
+++ 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"
 
@@ -15,6 +60,7 @@ Usage()
 		"  Syntax: ube [options] [set_value]\n"
 		"\n"
 		"\t-c <cfgfile>\tConfig file [default: /etc/ube.conf]\n"
+		"\t-d <descr>\tDrive description into config [default: 64K]\n"
 		"\t-g <name>\tSet parameter to value\n"
 		"\t-s <name>\tGet parameter value\n"
 		"\t-q\t\tQuiet mode\n"
@@ -26,12 +72,13 @@ int
 main(int argc, char **argv)
 {
 	char ch, mode = 0, szName[STRSIZ] = { 0 }, szVal[STRSIZ] = { 0 }, 
-	     szCfgName[PATH_MAX];
+	     szCfgName[PATH_MAX], szSec[STRSIZ];
 	const char *str;
-	int ret;
+	int ret = 0;
 
 	strlcpy(szCfgName, UBE_CFGNAME, sizeof szCfgName);
-	while ((ch = getopt(argc, argv, "hvqg:s:c:")) != -1)
+	strlcpy(szSec, UBE_SECTION, sizeof szSec);
+	while ((ch = getopt(argc, argv, "hvqg:s:c:d:")) != -1)
 		switch (ch) {
 			case 'g':
 				mode |= 1;
@@ -44,6 +91,9 @@ main(int argc, char **argv)
 			case 'c':
 				strlcpy(szCfgName, optarg, sizeof szCfgName);
 				break;
+			case 'd':
+				strlcpy(szSec, optarg, sizeof szSec);
+				break;
 			case 'v':
 				Verbose++;
 				break;
@@ -67,35 +117,43 @@ main(int argc, char **argv)
 		return 1;
 	}
 
+	if (ub_load(szSec)) {
+		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);
-			cfgUnloadConfig(&cfg);
-			return 2;
+			ret = 2;
+			goto end;
 		} 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);
-			cfgUnloadConfig(&cfg);
-			return 3;
+			ret = 3;
+			goto end;
 		}
 		if (!(mode & 0x80))
 			printf("Done\n");
 	}
 
+end:
+	ub_unload();
 	cfgUnloadConfig(&cfg);
-	return 0;
+	return ret;
 }