--- libaitcfg/src/parse.c 2014/01/29 23:48:34 1.13 +++ libaitcfg/src/parse.c 2023/01/23 23:27:26 1.21 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: parse.c,v 1.13 2014/01/29 23:48:34 misho Exp $ +* $Id: parse.c,v 1.21 2023/01/23 23:27:26 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 - 2014 +Copyright 2004 - 2023 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,10 +56,11 @@ _invertQueue(cfg_root_t * __restrict cfg) int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) { - char line[BUFSIZ]; + char line[BUFSIZ], origin[BUFSIZ], chkattr[STRSIZ]; struct tagCfg *av = NULL; int flg = 0; char *psAttr, *psVal, szSection[STRSIZ] = { 0 }; + FILE *ff; if (!f || !cfg) { cfg_SetErr(EINVAL, "Invalid parameter(s)"); @@ -81,7 +69,8 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) while (!feof(f)) { memset(line, 0, sizeof line); - fgets(line, sizeof line - 1, f); + if (!fgets(line, sizeof(line) - 1, f)) + break; #ifdef SUPPORT_USER_EOF /* check for user end-of-file */ if (line[0] == '.' && line[1] == '\n') @@ -92,6 +81,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) continue; } else { *psAttr = 0; + strlcpy(origin, line, sizeof origin); str_Trim(line); } @@ -108,10 +98,33 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) /* concat line to value */ AIT_SET_STRCAT(&av->cfg_val, line); if (!flg && AIT_ADDR(&av->cfg_val)) - str_Unquot((char*) AIT_GET_STR(&av->cfg_val)); + av->cfg_quoted += str_Unquot((char*) AIT_GET_STR(&av->cfg_val)); + + /* read include file */ + if (!flg && AIT_ADDR(&av->cfg_val) && + *AIT_GET_STR(&av->cfg_attr) == '%' && + !strcmp(AIT_GET_STR(&av->cfg_attr), "%include")) { + ff = fopen(AIT_GET_STR(&av->cfg_val), "r"); + if (ff) { + cfgReadConfig(ff, cfg); + fclose(ff); + } else + EDEBUG(ELWIX_DEBUG_LOG, "Error:: Can't open %s file", + AIT_GET_STR(&av->cfg_val)); + } continue; } + /* check for duplicated element */ + if (*line != '#' && *line != ';' && *line != '/' && *line != '%' && + (psAttr = strchr(line, '='))) { + strncpy(chkattr, line, psAttr - line); + chkattr[psAttr - line] = 0; + str_RTrim(chkattr); + if (cfg_findAttribute(cfg, szSection, chkattr)) + cfg_unsetAttribute(cfg, szSection, chkattr); + } + /* *NEW PAIR* alloc new pair element */ av = e_malloc(sizeof(struct tagCfg)); if (!av) { @@ -120,10 +133,16 @@ 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); } + /* check for comment or empty line */ + if (!*line || *line == '#' || *line == ';') { + AIT_SET_STR(&av->cfg_val, line); + continue; + } + /* check for continues line */ psAttr = line + (*line ? strlen(line) : 1) - 1; if (*psAttr == '\\') { @@ -131,11 +150,6 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) flg = 1; } - /* check for comment or empty line */ - if (!*line || *line == '#' || *line == ';') { - AIT_SET_STR(&av->cfg_val, line); - continue; - } /* section */ if (*line == '[') { psAttr = line + strlen(line) - 1; @@ -145,13 +159,13 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) strlcpy(szSection, line + 1, sizeof szSection); AIT_SET_STR(&av->cfg_sec, line); } else - EDEBUG(7, "Ignore section '%s' ... not found ']'", line); + EDEBUG(ELWIX_DEBUG_LOG, "Ignore section '%s' ... not found ']'", line); continue; } /* parse pair */ if (!(psAttr = strchr(line, '='))) { - AIT_SET_STR(&av->cfg_val, line); - EDEBUG(7, "Ignore a/v '%s' ... not found '='", line); + AIT_SET_STR(&av->cfg_val, origin); + EDEBUG(ELWIX_DEBUG_LOG, "Ignore a/v '%s' ... not found '='", line); continue; } else { *psAttr = 0; @@ -169,7 +183,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) str_RTrim(psAttr); str_LTrim(psVal); if (!flg) - str_Unquot(psVal); + av->cfg_quoted += 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*), @@ -178,6 +192,18 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) CFG_RC_LOCK(cfg); RB_INSERT(tagRC, cfg, av); CFG_RC_UNLOCK(cfg); + + /* read include file */ + if (!flg && *AIT_GET_STR(&av->cfg_attr) == '%' && + !strcmp(AIT_GET_STR(&av->cfg_attr), "%include")) { + ff = fopen(AIT_GET_STR(&av->cfg_val), "r"); + if (ff) { + cfgReadConfig(ff, cfg); + fclose(ff); + } else + EDEBUG(ELWIX_DEBUG_LOG, "Error:: Can't open %s file", + AIT_GET_STR(&av->cfg_val)); + } } return 0; @@ -195,7 +221,6 @@ int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace) { struct tagCfg *av; - time_t tim; char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { [0 ... STRSIZ - 1] = 0 }; if (!f || !cfg) { @@ -204,8 +229,7 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i } CFG_RC_LOCK(cfg); - _invertQueue(cfg); - SLIST_FOREACH(av, cfg, cfg_next) { + RB_FOREACH(av, tagRC, cfg) { /* empty lines or comment */ if (AIT_ISEMPTY(&av->cfg_attr)) { if (AIT_ISEMPTY(&av->cfg_val)) @@ -216,11 +240,10 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i /* 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, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) { LOGERR; - _invertQueue(cfg); CFG_RC_UNLOCK(cfg); return -1; } @@ -228,7 +251,6 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i memset(szSection, 0, sizeof szSection); if (!cfg_Write(f, "[]\n")) { LOGERR; - _invertQueue(cfg); CFG_RC_UNLOCK(cfg); return -1; } @@ -243,30 +265,101 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i else strlcat(line, "=", sizeof line); } - if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) + if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) { + if (av->cfg_quoted) + strlcat(line, "\"", sizeof line); strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); + if (av->cfg_quoted) + strlcat(line, "\"", 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); + return 0; +} + +/* + * cfgWriteConfigRaw() - Write config from memory by list + * + * @f = File handle + * @cfg = Config root + * @whitespace = Additional whitespace characters to file + * return: -1 error or 0 ok + */ +int +cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg, int whitespace) +{ + struct tagCfg *av, *nxt; + 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); + TAILQ_FOREACH_SAFE(av, cfg, cfg_next, nxt) { + /* 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, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) { + LOGERR; + CFG_RC_UNLOCK(cfg); + return -1; + } + } else if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { + memset(szSection, 0, sizeof szSection); + if (!cfg_Write(f, "[]\n")) { + LOGERR; + CFG_RC_UNLOCK(cfg); + return -1; + } + } + + /* build line */ 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); + 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) { + if (av->cfg_quoted) + strlcat(line, "\"", sizeof line); + strlcat(line, AIT_GET_STRZ(&av->cfg_val), sizeof line); + if (av->cfg_quoted) + strlcat(line, "\"", sizeof line); + } +skip_sec: + /* write */ + if (!cfg_Write(f, "%s\n", line)) { + LOGERR; + CFG_RC_UNLOCK(cfg); + return -1; + } } + CFG_RC_UNLOCK(cfg); return 0; } - /* * cfgConcatConfig() - Concat two configs into one * @@ -285,18 +378,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; @@ -322,9 +413,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; @@ -332,22 +423,28 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t 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; + flg = -1; break; } } - if (!flg) - SLIST_INSERT_HEAD(cfg, item, cfg_next); - else - SLIST_INSERT_AFTER(merge, item, cfg_next); + switch (flg) { + case -1: + continue; /* skip duplicated element */ + case 1: + TAILQ_INSERT_AFTER(cfg, merge, item, cfg_next); + break; + case 0: + TAILQ_INSERT_TAIL(cfg, item, cfg_next); + break; + } 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; @@ -377,7 +474,8 @@ cfgReadLines(FILE *f, const char *delim, const char *e while (!feof(f)) { psSec = psAttr = psVal = NULL; memset(line, 0, sizeof line); - fgets(line, sizeof line - 1, f); + if (!fgets(line, sizeof(line) - 1, f)) + break; /* check for user end-of-file */ if (strspn(line, end)) break; @@ -401,6 +499,10 @@ cfgReadLines(FILE *f, const char *delim, const char *e if (!av_MakeExt(p, SEC_LINES_DELIM, &psSec, &psAttr)) psAttr = p; + /* check for duplicated element */ + if (psAttr && cfg_findAttribute(cfg, psSec, psAttr)) + cfg_unsetAttribute(cfg, psSec, psAttr); + /* *NEW PAIR* alloc new pair element */ av = e_malloc(sizeof(struct tagCfg)); if (!av) { @@ -414,8 +516,10 @@ cfgReadLines(FILE *f, const char *delim, const char *e 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) + if (psVal) { + av->cfg_quoted = 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*), E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2); @@ -424,7 +528,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); @@ -432,7 +536,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); } @@ -468,13 +572,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; } @@ -482,10 +584,17 @@ 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_val)) + 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)) { + if (av->cfg_quoted) + AIT_SET_STRCAT(v, "\""); AIT_SET_STRCAT(v, AIT_GET_STR(&av->cfg_val)); + if (av->cfg_quoted) + AIT_SET_STRCAT(v, "\""); + } AIT_SET_STRCAT(v, eol); }