--- embedtools/src/ube.c 2014/01/28 22:03:01 1.1.2.4 +++ embedtools/src/ube.c 2014/01/28 23:30:46 1.1.2.8 @@ -15,6 +15,7 @@ Usage() " Syntax: ube [options] [set_value]\n" "\n" "\t-c \tConfig file [default: /etc/ube.conf]\n" + "\t-d \tDrive description into config [default: 64K]\n" "\t-g \tSet parameter to value\n" "\t-s \tGet parameter value\n" "\t-q\t\tQuiet mode\n" @@ -26,12 +27,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 +46,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 +72,42 @@ 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"); } 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; }