--- embedtools/src/ub_env.c 2014/01/29 01:26:28 1.1.2.9 +++ embedtools/src/ub_env.c 2014/01/29 01:40:35 1.1.2.10 @@ -64,6 +64,20 @@ ub_flash_io(const char *csSec, int mode) return 0; } +static inline const char * +ub_envmatch(const char *csName, const char *e) +{ + const char *str = NULL; + + while (*csName == *e++) + if (*csName++ == '=') + return e; + if (!*csName && *(e - 1) == '=') + return e; + + return NULL; +} + int ub_load(const char *csSec) { @@ -98,9 +112,31 @@ ub_unload() const char* ub_getenv(const char *csSec, const char *csName) { + char *e, *nxt; + size_t dlen; const char *str = NULL; + FTRACE(3); + + str = cfg_getAttribute(&cfg, csSec, "size"); + dlen = strtol(str, NULL, 0); + if (!dlen) + return NULL; + else + dlen--; + + for (e = env->env_data; *e; e = nxt + 1) { + for (nxt = e; *nxt; nxt++) + if (nxt >= env->env_data + dlen) { + printf("Error:: environment not terminated\n"); + return NULL; + } + + str = ub_envmatch(csName, e); + if (str) + break; + } return str; }