--- libaitcfg/src/parse.c 2012/08/01 00:39:11 1.9 +++ libaitcfg/src/parse.c 2017/06/30 08:44:44 1.17 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: parse.c,v 1.9 2012/08/01 00:39:11 misho Exp $ +* $Id: parse.c,v 1.17 2017/06/30 08:44:44 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004 - 2017 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -44,35 +44,8 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH SUCH DAMAGE. */ #include "global.h" -#include "aitcfg.h" -static inline int -cfg_Write(FILE *f, char *fmt, ...) -{ - int ret = 0; - va_list lst; - - va_start(lst, fmt); - ret = vfprintf(f, fmt, lst); - va_end(lst); - - return ret; -} - -static inline void -_invertQueue(cfg_root_t * __restrict cfg) -{ - struct tagCfg *item, *next, *prev = NULL; - - SLIST_FOREACH_SAFE(item, cfg, cfg_next, next) { - item->cfg_next.sle_next = prev; - prev = item; - } - cfg->slh_first = prev; -} - - /* * cfgReadConfig() - Read file and add new item at config root * @@ -83,11 +56,16 @@ _invertQueue(cfg_root_t * __restrict cfg) int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) { - char line[BUFSIZ]; + char line[BUFSIZ], origin[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); @@ -101,7 +79,8 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) continue; } else { *psAttr = 0; - io_TrimStr(line); + strlcpy(origin, line, sizeof origin); + str_Trim(line); } if (flg) { @@ -116,20 +95,20 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) flg = 0; /* concat line to value */ AIT_SET_STRCAT(&av->cfg_val, line); - if (!flg) - io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val)); + if (!flg && AIT_ADDR(&av->cfg_val)) + str_Unquot((char*) AIT_GET_STR(&av->cfg_val)); continue; } /* *NEW PAIR* alloc new pair element */ - av = io_malloc(sizeof(struct tagCfg)); + av = e_malloc(sizeof(struct tagCfg)); if (!av) { - LOGERR; + cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); return -1; } else { memset(av, 0, sizeof(struct tagCfg)); CFG_RC_LOCK(cfg); - SLIST_INSERT_HEAD(cfg, av, cfg_next); + TAILQ_INSERT_TAIL(cfg, av, cfg_next); CFG_RC_UNLOCK(cfg); } @@ -147,20 +126,20 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) } /* section */ if (*line == '[') { - AIT_SET_STR(&av->cfg_val, line); psAttr = line + strlen(line) - 1; if (*psAttr == ']') { *psAttr = 0; flg = 0; strlcpy(szSection, line + 1, sizeof szSection); + AIT_SET_STR(&av->cfg_sec, line); } else - ioDEBUG(7, "Ignore section '%s' ... not found ']'", line); + EDEBUG(7, "Ignore section '%s' ... not found ']'", line); continue; } /* parse pair */ if (!(psAttr = strchr(line, '='))) { - AIT_SET_STR(&av->cfg_val, line); - ioDEBUG(7, "Ignore a/v '%s' ... not found '='", line); + AIT_SET_STR(&av->cfg_val, origin); + EDEBUG(7, "Ignore a/v '%s' ... not found '='", line); continue; } else { *psAttr = 0; @@ -172,17 +151,17 @@ 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); + E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2); } - io_RTrimStr(psAttr); - io_LTrimStr(psVal); + str_RTrim(psAttr); + str_LTrim(psVal); if (!flg) - io_UnquotStr(psVal); + str_Unquot(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, 1) / 2); + E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); CFG_RC_LOCK(cfg); RB_INSERT(tagRC, cfg, av); @@ -204,23 +183,33 @@ int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace) { struct tagCfg *av; - time_t tim; - char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; + char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { [0 ... STRSIZ - 1] = 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) && - strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) { + RB_FOREACH(av, tagRC, cfg) { + /* empty lines or comment */ + if (AIT_ISEMPTY(&av->cfg_attr)) { + if (AIT_ISEMPTY(&av->cfg_val)) + continue; + strlcpy(line, AIT_GET_STR(&av->cfg_val), sizeof line); + goto skip_sec; + } + + /* section [] */ + if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && + strcmp(AIT_GET_STRZ(&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) { + } else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { memset(szSection, 0, sizeof szSection); if (!cfg_Write(f, "\n[]\n")) { LOGERR; @@ -232,15 +221,15 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i /* build line */ memset(line, 0, sizeof line); if (!AIT_ISEMPTY(&av->cfg_attr) && AIT_TYPE(&av->cfg_attr) == string) { - strlcpy(line, AIT_GET_STR(&av->cfg_attr), sizeof line); + 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_STR(&av->cfg_val), sizeof line); - + strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); +skip_sec: /* write */ if (!cfg_Write(f, "%s\n", line)) { LOGERR; @@ -248,16 +237,8 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i 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; } @@ -279,19 +260,17 @@ cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_ CFG_RC_LOCK(add_cfg); CFG_RC_LOCK(cfg); - /* 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); - - /* concat red-black trees */ - SLIST_FOREACH(item, add_cfg, cfg_next) + /* concat lists & red-black trees */ + TAILQ_FOREACH(item, add_cfg, cfg_next) { + TAILQ_INSERT_TAIL(cfg, item, cfg_next); RB_INSERT(tagRC, cfg, item); + } CFG_RC_UNLOCK(cfg); - CFG_RC_UNLOCK(add_cfg); - add_cfg->slh_first = NULL; - add_cfg->rbh_root = NULL; + TAILQ_INIT(add_cfg); + RB_INIT(add_cfg); + CFG_RC_UNLOCK(add_cfg); pthread_mutex_destroy(&add_cfg->rc_mtx); return 0; } @@ -306,7 +285,7 @@ cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_ int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) { - struct tagCfg *item, *merge, *add_next, *next = NULL; + struct tagCfg *item, *merge, *add_next, *next; int flg; if (!cfg || !add_cfg) @@ -314,34 +293,35 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t CFG_RC_LOCK(add_cfg); CFG_RC_LOCK(cfg); - SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { + + /* merge lists */ + TAILQ_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { flg = 0; - SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { + TAILQ_FOREACH_SAFE(merge, cfg, cfg_next, next) { if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { - SLIST_INSERT_AFTER(merge, item, cfg_next); - RB_INSERT(tagRC, cfg, item); flg = 1; break; } 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))) { - SLIST_INSERT_AFTER(merge, item, cfg_next); - RB_INSERT(tagRC, cfg, item); flg = 1; break; } } - if (!flg) { - SLIST_INSERT_AFTER(merge, item, cfg_next); - RB_INSERT(tagRC, cfg, item); - } + if (!flg) + TAILQ_INSERT_TAIL(cfg, item, cfg_next); + else + TAILQ_INSERT_AFTER(cfg, merge, item, cfg_next); + RB_INSERT(tagRC, cfg, item); } + CFG_RC_UNLOCK(cfg); - CFG_RC_UNLOCK(add_cfg); - add_cfg->slh_first = NULL; - add_cfg->rbh_root = NULL; + TAILQ_INIT(add_cfg); + RB_INIT(add_cfg); + CFG_RC_UNLOCK(add_cfg); pthread_mutex_destroy(&add_cfg->rc_mtx); return 0; } @@ -360,9 +340,15 @@ cfgReadLines(FILE *f, const char *delim, const char *e { char line[BUFSIZ]; struct tagCfg *d, *av = NULL; - char *psAttr, *psVal = 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 */ @@ -374,45 +360,52 @@ cfgReadLines(FILE *f, const char *delim, const char *e continue; } else { *psAttr = 0; - io_TrimStr(line); + str_Trim(line); if (!*line) continue; } - if (!io_MakeAV2(line, delim, &psAttr, &psVal)) + if (!av_MakeExt(line, delim, &p, &psVal)) continue; else { - io_LTrimStr(psVal); - io_RTrimStr(psAttr); + str_RTrim(p); + str_LTrim(psVal); } + if (!av_MakeExt(p, SEC_LINES_DELIM, &psSec, &psAttr)) + psAttr = p; /* *NEW PAIR* alloc new pair element */ - av = io_malloc(sizeof(struct tagCfg)); + av = e_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*), + E_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, 1) / 2); + E_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); + TAILQ_REMOVE(cfg, d, cfg_next); AIT_FREE_VAL(&d->cfg_val); AIT_FREE_VAL(&d->cfg_attr); AIT_FREE_VAL(&d->cfg_sec); - io_free(d); + e_free(d); } - SLIST_INSERT_HEAD(cfg, av, cfg_next); + TAILQ_INSERT_TAIL(cfg, av, cfg_next); RB_INSERT(tagRC, cfg, av); CFG_RC_UNLOCK(cfg); } @@ -420,3 +413,56 @@ cfgReadLines(FILE *f, const char *delim, const char *e return 0; } +/* + * 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 ait_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 = ait_allocVar())) { + cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); + return NULL; + } else + AIT_INIT_VAL2(v, string); + + TAILQ_FOREACH(av, cfg, cfg_next) { + if (section) { + if (!AIT_ISEMPTY(&av->cfg_sec) && *section) + continue; + if (strcmp(section, AIT_GET_STRZ(&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); + } + if (!AIT_ISEMPTY(&av->cfg_attr)) { + 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; +}