--- libaitcfg/src/parse.c 2022/12/05 22:31:12 1.20 +++ 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.20 2022/12/05 22:31:12 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 - 2021 +Copyright 2004 - 2023 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -56,7 +56,7 @@ SUCH DAMAGE. int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) { - char line[BUFSIZ], origin[BUFSIZ]; + char line[BUFSIZ], origin[BUFSIZ], chkattr[STRSIZ]; struct tagCfg *av = NULL; int flg = 0; char *psAttr, *psVal, szSection[STRSIZ] = { 0 }; @@ -98,7 +98,7 @@ 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) && @@ -109,12 +109,22 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) cfgReadConfig(ff, cfg); fclose(ff); } else - EDEBUG(7, "Error:: Can't open %s file", + 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) { @@ -149,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, origin); - EDEBUG(7, "Ignore a/v '%s' ... not found '='", line); + EDEBUG(ELWIX_DEBUG_LOG, "Ignore a/v '%s' ... not found '='", line); continue; } else { *psAttr = 0; @@ -173,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*), @@ -191,7 +201,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) cfgReadConfig(ff, cfg); fclose(ff); } else - EDEBUG(7, "Error:: Can't open %s file", + EDEBUG(ELWIX_DEBUG_LOG, "Error:: Can't open %s file", AIT_GET_STR(&av->cfg_val)); } } @@ -232,14 +242,14 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i 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))) { + 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[]\n")) { + if (!cfg_Write(f, "[]\n")) { LOGERR; CFG_RC_UNLOCK(cfg); return -1; @@ -255,8 +265,13 @@ 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)) { @@ -303,14 +318,14 @@ cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg 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))) { + 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[]\n")) { + if (!cfg_Write(f, "[]\n")) { LOGERR; CFG_RC_UNLOCK(cfg); return -1; @@ -326,8 +341,13 @@ cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg 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)) { @@ -403,15 +423,21 @@ 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) - TAILQ_INSERT_TAIL(cfg, item, cfg_next); - else - TAILQ_INSERT_AFTER(cfg, 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); } @@ -473,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) { @@ -486,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); @@ -556,8 +588,13 @@ cfgWriteLines(FILE *f, const char *delim, const char * 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_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); }