--- libaitcfg/src/parse.c 2008/08/28 13:17:41 1.1 +++ libaitcfg/src/parse.c 2010/03/22 14:53:49 1.4 @@ -1,3 +1,11 @@ +/************************************************************************* +* (C) 2008 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: parse.c,v 1.4 2010/03/22 14:53:49 misho Exp $ +* +*************************************************************************/ #include "global.h" #include "aitcfg.h" #include "tools.h" @@ -16,8 +24,84 @@ static inline int cfgDbg(FILE *f, char *fmt, ...) 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; + 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; +} + +// --------------------------------------------------- + /* * ReadConfig() Read from file and add new item to config list * @f = file resource @@ -55,7 +139,9 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) if (*szLine == '[') { pos = strlen((char*) szLine) - 1; if (szLine[pos] != ']') { +#ifdef __DEBUG cfgDbg(stdout, "WARNING:: Ignore section %s ... not closed breket\n", szLine); +#endif } else { szLine[pos] = 0; strncpy((char*) szSection, (char*) szLine + 1, MAX_STR); @@ -69,7 +155,9 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) // Devide pairs pos = strchr((char*) szLine, '=') ? strchr((char*) szLine, '=') - (char*) szLine : 0; if (!pos) { +#ifdef __DEBUG cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine); +#endif continue; } else { av = malloc(sizeof(struct tagPair)); @@ -77,6 +165,7 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) LOGERR; return -1; } else { + memset(av, 0, sizeof(struct tagPair)); // added new element av->sle_next = cfg->slh_first; cfg->slh_first = av; @@ -89,7 +178,7 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) free(av); return -1; } else - strcpy((char*) av->psSection, (char*) szSection); + strlcpy((char*) av->psSection, (char*) szSection, strlen((char*) szSection) + 1); } else av->psSection = NULL; @@ -98,6 +187,7 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) szLine[pos] = 0; rtrim(psAttr); ltrim(psVal); + unquot(psVal); #ifdef __DEBUG cfgDbg(stdout, "DEBUG:: Attr(%p) ->%s size=%d Value(%p) ->%s size=%d\n", psAttr, psAttr, strlen((char*) psAttr), psVal, psVal, strlen((char*) psVal)); @@ -110,7 +200,7 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) free(av); return -1; } else - strcpy((char*) av->psAttribute, (char*) psAttr); + strlcpy((char*) av->psAttribute, (char*) psAttr, strlen((char*) psAttr) + 1); // added value to element av->psValue = malloc(strlen((char*) psVal) + 1); if (!av->psValue) { @@ -120,7 +210,7 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) free(av); return -1; } else - strcpy((char*) av->psValue, (char*) psVal); + strlcpy((char*) av->psValue, (char*) psVal, strlen((char*) psVal) + 1); } } @@ -135,51 +225,89 @@ int ReadConfig(FILE *f, sl_config * __restrict cfg) */ int WriteConfig(FILE *f, sl_config * __restrict cfg) { - struct tagPair *av; - time_t tim; - char szTime[MAX_STR + 1]; - u_char szSection[MAX_STR + 1]; + return cfgWrite(f, cfg, 1); +} - bzero(szSection, MAX_STR + 1); +/* + * 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); +} - 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; +/* + * 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) +{ + struct tagPair *item; + int ret = 0; + + if (!cfg || !add_cfg) return -1; - } - for (av = cfg->slh_first; av; av = av->sle_next) { - if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) { - bzero(szSection, MAX_STR + 1); - strcpy((char*) szSection, (char*) av->psSection); - if (!cfgDbg(f, "\n[%s]\n", av->psSection)) { - LOGERR; - return -1; + for (item = cfg->slh_first; item->sle_next; item = item->sle_next); + item->sle_next = add_cfg->slh_first; + + add_cfg->slh_first = NULL; + + return ret; +} + +/* + * 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) +{ + struct tagPair *item, *merge, *add_next, *next = NULL; + int flg; + + if (!cfg || !add_cfg) + return -1; + + item = add_cfg->slh_first; + while (item) { + add_next = item->sle_next; + + 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) { + flg = 1; + merge->sle_next = item; + item->sle_next = next; + break; } - } - if (!av->psSection && *szSection) { - bzero(szSection, MAX_STR + 1); - if (!cfgDbg(f, "\n[]\n")) { - LOGERR; - return -1; + if (merge->psSection && item->psSection && + !strcmp((char*) merge->psSection, (char*) item->psSection)) { + flg = 1; + merge->sle_next = item; + item->sle_next = next; + break; } } - if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) { - LOGERR; - return -1; + if (!flg) { + if (!merge->sle_next) { + merge->sle_next = item; + item->sle_next = NULL; + } else + return -1; } - } - 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; + item = add_next; } + + add_cfg->slh_first = NULL; return 0; }