--- libaitcfg/src/parse.c 2012/08/30 13:49:44 1.10.2.2 +++ libaitcfg/src/parse.c 2014/01/29 23:48:34 1.13 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: parse.c,v 1.10.2.2 2012/08/30 13:49:44 misho Exp $ +* $Id: parse.c,v 1.13 2014/01/29 23:48:34 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 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -44,22 +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) { @@ -88,6 +74,11 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) 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 +92,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) continue; } else { *psAttr = 0; - io_TrimStr(line); + str_Trim(line); } if (flg) { @@ -117,14 +108,14 @@ 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)) - io_UnquotStr((char*) AIT_GET_STR(&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)); @@ -147,20 +138,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); + EDEBUG(7, "Ignore a/v '%s' ... not found '='", line); continue; } else { *psAttr = 0; @@ -172,17 +163,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); @@ -205,25 +196,39 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i { 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 [] */ + /* 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)) { 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; + _invertQueue(cfg); 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")) { + if (!cfg_Write(f, "[]\n")) { LOGERR; + _invertQueue(cfg); CFG_RC_UNLOCK(cfg); return -1; } @@ -240,10 +245,11 @@ 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; } @@ -288,10 +294,10 @@ cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_ RB_INSERT(tagRC, cfg, item); CFG_RC_UNLOCK(cfg); - CFG_RC_UNLOCK(add_cfg); add_cfg->slh_first = NULL; add_cfg->rbh_root = NULL; + CFG_RC_UNLOCK(add_cfg); pthread_mutex_destroy(&add_cfg->rc_mtx); return 0; } @@ -339,10 +345,10 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t } CFG_RC_UNLOCK(cfg); - CFG_RC_UNLOCK(add_cfg); add_cfg->slh_first = NULL; add_cfg->rbh_root = NULL; + CFG_RC_UNLOCK(add_cfg); pthread_mutex_destroy(&add_cfg->rc_mtx); return 0; } @@ -361,7 +367,7 @@ 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; @@ -369,6 +375,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e 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 */ @@ -380,31 +387,38 @@ 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 */ @@ -415,7 +429,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e 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); @@ -434,7 +448,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e * @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 io_freeVar() + * 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) @@ -448,8 +462,8 @@ cfgWriteLines(FILE *f, const char *delim, const char * delim = ATR_LINES_DELIM; if (!eol) eol = EOL_LINES_DELIM; - if (!(v = io_allocVar())) { - cfg_SetErr(io_GetErrno(), "%s", io_GetError()); + if (!(v = ait_allocVar())) { + cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); return NULL; } else AIT_INIT_VAL2(v, string);