--- libaitcfg/src/parse.c 2013/05/30 09:12:27 1.12 +++ 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.12 2013/05/30 09:12:27 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, 2013 +Copyright 2004 - 2017 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,19 +46,6 @@ SUCH DAMAGE. #include "global.h" -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 * @@ -69,7 +56,7 @@ _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 }; @@ -92,6 +79,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) continue; } else { *psAttr = 0; + strlcpy(origin, line, sizeof origin); str_Trim(line); } @@ -120,7 +108,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) } 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); } @@ -138,19 +126,19 @@ 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 EDEBUG(7, "Ignore section '%s' ... not found ']'", line); continue; } /* parse pair */ if (!(psAttr = strchr(line, '='))) { - AIT_SET_STR(&av->cfg_val, line); + AIT_SET_STR(&av->cfg_val, origin); EDEBUG(7, "Ignore a/v '%s' ... not found '='", line); continue; } else { @@ -195,8 +183,7 @@ 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)"); @@ -204,19 +191,25 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i } CFG_RC_LOCK(cfg); - _invertQueue(cfg); - SLIST_FOREACH(av, cfg, cfg_next) { - /* add +1 line for section [] */ + 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_STR(&av->cfg_sec), szSection)) { + 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; @@ -236,25 +229,16 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i } if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); - +skip_sec: /* 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; } @@ -276,18 +260,16 @@ 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); - 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; @@ -313,9 +295,9 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t CFG_RC_LOCK(cfg); /* merge lists */ - SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { + 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)) { flg = 1; break; @@ -329,16 +311,16 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t } if (!flg) - SLIST_INSERT_HEAD(cfg, item, cfg_next); + TAILQ_INSERT_TAIL(cfg, item, cfg_next); else - SLIST_INSERT_AFTER(merge, item, cfg_next); + TAILQ_INSERT_AFTER(cfg, merge, item, cfg_next); RB_INSERT(tagRC, cfg, item); } CFG_RC_UNLOCK(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; @@ -415,7 +397,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e /* 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); @@ -423,7 +405,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e 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); } @@ -459,13 +441,11 @@ cfgWriteLines(FILE *f, const char *delim, const char * } else AIT_INIT_VAL2(v, string); - SLIST_FOREACH(av, cfg, cfg_next) { - if (AIT_ISEMPTY(&av->cfg_attr)) - continue; + TAILQ_FOREACH(av, cfg, cfg_next) { if (section) { if (!AIT_ISEMPTY(&av->cfg_sec) && *section) continue; - if (strcmp(section, AIT_GET_STR(&av->cfg_sec))) + if (strcmp(section, AIT_GET_STRZ(&av->cfg_sec))) continue; } @@ -473,8 +453,10 @@ cfgWriteLines(FILE *f, const char *delim, const char * 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_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);