--- libaitcfg/src/parse.c 2012/04/02 14:39:02 1.6.4.1 +++ libaitcfg/src/parse.c 2012/09/18 13:32:48 1.10.2.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: parse.c,v 1.6.4.1 2012/04/02 14:39:02 misho Exp $ +* $Id: parse.c,v 1.10.2.6 2012/09/18 13:32:48 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -47,99 +47,19 @@ SUCH DAMAGE. #include "aitcfg.h" -#if 0 -// cfgDbg() Debug/Log operation -static inline int cfgDbg(FILE *f, char *fmt, ...) +static inline void +_invertQueue(cfg_root_t * __restrict cfg) { - int ret = 0; - va_list lst; + struct tagCfg *item, *next, *prev = NULL; - va_start(lst, fmt); - ret = vfprintf(f, fmt, lst); - va_end(lst); - - return ret; -} - -/* - * InvertQueue() InvertQueue order //{cfg} list of elements for revert - * @cfg = Head list element for revert -*/ -static inline void InvertQueue(sl_config * __restrict cfg) -{ - struct tagPair *item, *next, *prev = NULL; - - for (item = cfg->slh_first; item; item = next) { - next = item->sle_next; - item->sle_next = prev; + SLIST_FOREACH_SAFE(item, cfg, cfg_next, next) { + item->cfg_next.sle_next = prev; prev = item; } cfg->slh_first = prev; } -// cfgWrite() Write to file from config list -static inline int cfgWrite(FILE *f, sl_config * __restrict cfg, int whitespace) -{ - struct tagPair *av; - time_t tim; - char szTime[MAX_STR + 1]; - u_char szSection[MAX_STR + 1]; - bzero(szSection, MAX_STR + 1); - - bzero(szTime, MAX_STR + 1); - time(&tim); - strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); - if (!cfgDbg(f, "## Write Config :: %s\n#\n", szTime)) { - LOGERR; - return -1; - } - - InvertQueue(cfg); - for (av = cfg->slh_first; av; av = av->sle_next) { - if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) { - strlcpy((char*) szSection, (char*) av->psSection, MAX_STR + 1); - if (!cfgDbg(f, "\n[%s]\n", av->psSection)) { - LOGERR; - return -1; - } - } - if (!av->psSection && *szSection) { - bzero(szSection, MAX_STR + 1); - if (!cfgDbg(f, "\n[]\n")) { - LOGERR; - return -1; - } - } - - if (whitespace) { - if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) { - LOGERR; - return -1; - } - } else { - if (!cfgDbg(f, "%s=%s\n", av->psAttribute, av->psValue)) { - LOGERR; - return -1; - } - } - } - InvertQueue(cfg); - - bzero(szTime, MAX_STR + 1); - time(&tim); - strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); - if (!cfgDbg(f, "\n#\n## Done. :: %s\n", szTime)) { - LOGERR; - return -1; - } - - return 0; -} - -// --------------------------------------------------- -#endif - /* * cfgReadConfig() - Read file and add new item at config root * @@ -147,13 +67,19 @@ static inline int cfgWrite(FILE *f, sl_config * __rest * @cfg = Config root * return: -1 error or 0 ok */ -int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) +int +cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) { char line[BUFSIZ]; struct tagCfg *av = NULL; int flg = 0; char *psAttr, *psVal, szSection[STRSIZ] = { 0 }; + if (!f || !cfg) { + cfg_SetErr(EINVAL, "Invalid parameter(s)"); + return -1; + } + while (!feof(f)) { memset(line, 0, sizeof line); fgets(line, sizeof line - 1, f); @@ -182,15 +108,15 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg flg = 0; /* concat line to value */ AIT_SET_STRCAT(&av->cfg_val, line); - if (!flg) + if (!flg && AIT_ADDR(&av->cfg_val)) io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val)); continue; } /* *NEW PAIR* alloc new pair element */ - av = malloc(sizeof(struct tagCfg)); + av = io_malloc(sizeof(struct tagCfg)); if (!av) { - LOGERR; + cfg_SetErr(io_GetErrno(), "%s", io_GetError()); return -1; } else { memset(av, 0, sizeof(struct tagCfg)); @@ -200,7 +126,7 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg } /* check for continues line */ - psAttr = line + strlen(line) - 1; + psAttr = line + (*line ? strlen(line) : 1) - 1; if (*psAttr == '\\') { *psAttr = 0; flg = 1; @@ -238,7 +164,7 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg if (*szSection) { AIT_SET_STR(&av->cfg_sec, szSection); AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), - io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); + io_align(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); } io_RTrimStr(psAttr); @@ -248,7 +174,7 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg AIT_SET_STR(&av->cfg_val, psVal); AIT_SET_STR(&av->cfg_attr, psAttr); AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), - io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2); + io_align(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); CFG_RC_LOCK(cfg); RB_INSERT(tagRC, cfg, av); @@ -258,99 +184,304 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg return 0; } -#if 0 /* - * WriteConfig() Write to file from items in config list - * @f = file resource - * @cfg = Head list element - * return: 0 ok; -1 error:: can`t write to file -*/ -int WriteConfig(FILE *f, sl_config * __restrict cfg) + * cfgWriteConfig() - Write config from memory + * + * @f = File handle + * @cfg = Config root + * @whitespace = Additional whitespace characters to file + * return: -1 error or 0 ok + */ +int +cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace) { - return cfgWrite(f, cfg, 1); -} + struct tagCfg *av; + time_t tim; + char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; -/* - * cfg_WriteConfig() Write to file from items in config list without whitespaces! - * @f = file resource - * @cfg = Head list element - * return: 0 ok; -1 error:: can`t write to file -*/ -int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg) -{ - return cfgWrite(f, cfg, 0); + if (!f || !cfg) { + cfg_SetErr(EINVAL, "Invalid parameter(s)"); + return -1; + } + + CFG_RC_LOCK(cfg); + _invertQueue(cfg); + SLIST_FOREACH(av, cfg, cfg_next) { + /* add +1 line for section [] */ + if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && + strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) { + strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); + if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) { + LOGERR; + CFG_RC_UNLOCK(cfg); + return -1; + } + } + if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { + memset(szSection, 0, sizeof szSection); + if (!cfg_Write(f, "\n[]\n")) { + LOGERR; + CFG_RC_UNLOCK(cfg); + return -1; + } + } + + /* build line */ + memset(line, 0, sizeof line); + if (!AIT_ISEMPTY(&av->cfg_attr) && AIT_TYPE(&av->cfg_attr) == string) { + strlcpy(line, AIT_GET_STRZ(&av->cfg_attr), sizeof line); + if (whitespace) + strlcat(line, " = ", sizeof line); + else + strlcat(line, "=", sizeof line); + } + if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) + strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); + + /* write */ + if (!cfg_Write(f, "%s\n", line)) { + LOGERR; + _invertQueue(cfg); + CFG_RC_UNLOCK(cfg); + return -1; + } + } + _invertQueue(cfg); + CFG_RC_UNLOCK(cfg); + + if (whitespace) { + time(&tim); + memset(line, 0, sizeof line); + strftime(line, sizeof line, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); + cfg_Write(f, "\n## Config was saved at :: %s ##\n", line); + } + + return 0; } /* - * ConcatConfig() Concat two list in one - * @cfg = Head list element of main list - * @add_cfg = Head list element of added list - * return: 0 ok; -1 error:: can`t concat lists -*/ -int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) + * cfgConcatConfig() - Concat two configs into one + * + * @cfg = Config root + * @add_cfg = Concated config will be destroy after merge + * return: -1 error or 0 ok + */ +int +cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) { - struct tagPair *item; - int ret = 0; + struct tagCfg *item; if (!cfg || !add_cfg) return -1; - for (item = cfg->slh_first; item->sle_next; item = item->sle_next); - item->sle_next = add_cfg->slh_first; + CFG_RC_LOCK(add_cfg); + CFG_RC_LOCK(cfg); - add_cfg->slh_first = NULL; + /* concat lists */ + for (item = SLIST_FIRST(cfg); SLIST_NEXT(item, cfg_next); item = SLIST_NEXT(item, cfg_next)); + SLIST_NEXT(item, cfg_next) = SLIST_FIRST(add_cfg); - return ret; + /* concat red-black trees */ + SLIST_FOREACH(item, add_cfg, cfg_next) + RB_INSERT(tagRC, cfg, item); + + CFG_RC_UNLOCK(cfg); + + add_cfg->slh_first = NULL; + add_cfg->rbh_root = NULL; + CFG_RC_UNLOCK(add_cfg); + pthread_mutex_destroy(&add_cfg->rc_mtx); + return 0; } /* - * MergeConfig() Marge two list in one cfg and destroy add_cfg - * @cfg = Head list element of main list - * @add_cfg = Head list element of merged list (destroy after all!) - * return: 0 ok; -1 error:: can`t merge lists -*/ -int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) + * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg + * + * @cfg = Config root of main list + * @add_cfg = Merged config will be destroy after merge + * return: -1 error or 0 ok + */ +int +cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) { - struct tagPair *item, *merge, *add_next, *next = NULL; + struct tagCfg *item, *merge, *add_next, *next; int flg; if (!cfg || !add_cfg) return -1; - item = add_cfg->slh_first; - while (item) { - add_next = item->sle_next; + CFG_RC_LOCK(add_cfg); + CFG_RC_LOCK(cfg); - for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; - merge = merge->sle_next, next = merge->sle_next) { - if (!merge->psSection && !item->psSection) { + /* merge lists */ + SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { + flg = 0; + SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { + if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { flg = 1; - merge->sle_next = item; - item->sle_next = next; break; } - if (merge->psSection && item->psSection && - !strcmp((char*) merge->psSection, (char*) item->psSection)) { + if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && + AIT_ADDR(&merge->cfg_sec) && AIT_ADDR(&item->cfg_sec) && + !strcmp(AIT_GET_STR(&merge->cfg_sec), AIT_GET_STR(&item->cfg_sec))) { flg = 1; - merge->sle_next = item; - item->sle_next = next; break; } } - if (!flg) { - if (!merge->sle_next) { - merge->sle_next = item; - item->sle_next = NULL; - } else - return -1; - } - - item = add_next; + if (!flg) + SLIST_INSERT_HEAD(cfg, item, cfg_next); + else + SLIST_INSERT_AFTER(merge, item, cfg_next); + RB_INSERT(tagRC, cfg, item); } + CFG_RC_UNLOCK(cfg); + add_cfg->slh_first = NULL; + add_cfg->rbh_root = NULL; + CFG_RC_UNLOCK(add_cfg); + pthread_mutex_destroy(&add_cfg->rc_mtx); + return 0; +} +/* + * cfgReadLines() - Read custom lines and add new item at config root + * + * @f = File resource + * @delim = Custom delimiter, if =NULL default is '=' + * @end = Custom user end of file, if =NULL default is EOF + * @cfg = Config root + * return: -1 error or 0 ok + */ +int +cfgReadLines(FILE *f, const char *delim, const char *end, cfg_root_t * __restrict cfg) +{ + char line[BUFSIZ]; + struct tagCfg *d, *av = NULL; + char *p, *psSec, *psAttr, *psVal; + + if (!cfg) + return -1; + if (!delim) + delim = ATR_LINES_DELIM; + + while (!feof(f)) { + psSec = psAttr = psVal = NULL; + memset(line, 0, sizeof line); + fgets(line, sizeof line - 1, f); + /* check for user end-of-file */ + if (strspn(line, end)) + break; + + if (!(psAttr = strpbrk(line, "\r\n"))) { + /* skip line, too long */ + continue; + } else { + *psAttr = 0; + io_TrimStr(line); + if (!*line) + continue; + } + + if (!io_MakeAV2(line, delim, &p, &psVal)) + continue; + else { + io_RTrimStr(p); + io_LTrimStr(psVal); + } + if (!io_MakeAV2(p, SEC_LINES_DELIM, &psSec, &psAttr)) + psAttr = p; + + /* *NEW PAIR* alloc new pair element */ + av = io_malloc(sizeof(struct tagCfg)); + if (!av) { + LOGERR; + return -1; + } else + memset(av, 0, sizeof(struct tagCfg)); + + if (psSec) { + AIT_SET_STR(&av->cfg_sec, psSec); + AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), + io_align(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); + } + if (psVal) + AIT_SET_STR(&av->cfg_val, psVal); + AIT_SET_STR(&av->cfg_attr, psAttr); + AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), + io_align(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); + + CFG_RC_LOCK(cfg); + /* find & delete duplicates */ + if ((d = RB_FIND(tagRC, cfg, av))) { + RB_REMOVE(tagRC, cfg, d); + SLIST_REMOVE(cfg, d, tagCfg, cfg_next); + + AIT_FREE_VAL(&d->cfg_val); + AIT_FREE_VAL(&d->cfg_attr); + AIT_FREE_VAL(&d->cfg_sec); + io_free(d); + } + + SLIST_INSERT_HEAD(cfg, av, cfg_next); + RB_INSERT(tagRC, cfg, av); + CFG_RC_UNLOCK(cfg); + } + return 0; } -#endif + +/* + * cfgWriteLines() - Write custom lines and export data to variable + * + * @f = File resource + * @delim = Custom delimiter, if =NULL default is '=' + * @eol = End of line string, if =NULL default is "\n" + * @section = Export only section, if =NULL default is all + * @cfg = Config root + * return: =NULL error or !=NULL exported data, must be free after use with io_freeVar() + */ +ait_val_t * +cfgWriteLines(FILE *f, const char *delim, const char *eol, const char *section, cfg_root_t * __restrict cfg) +{ + ait_val_t *v = NULL; + struct tagCfg *av; + + if (!cfg) + return NULL; + if (!delim) + delim = ATR_LINES_DELIM; + if (!eol) + eol = EOL_LINES_DELIM; + if (!(v = io_allocVar())) { + cfg_SetErr(io_GetErrno(), "%s", io_GetError()); + return NULL; + } else + AIT_INIT_VAL2(v, string); + + SLIST_FOREACH(av, cfg, cfg_next) { + if (AIT_ISEMPTY(&av->cfg_attr)) + continue; + if (section) { + if (!AIT_ISEMPTY(&av->cfg_sec) && *section) + continue; + if (strcmp(section, AIT_GET_STR(&av->cfg_sec))) + continue; + } + + if (!AIT_ISEMPTY(&av->cfg_sec)) { + AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_sec)); + AIT_SET_STRCAT(v, SEC_LINES_DELIM); + } + AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_attr)); + AIT_SET_STRCAT(v, delim); + if (!AIT_ISEMPTY(&av->cfg_val)) + AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_val)); + AIT_SET_STRCAT(v, eol); + } + + if (f) + fputs(AIT_GET_STR(v), f); + return v; +}