version 1.1, 2008/08/28 13:17:41
|
version 1.7, 2012/04/04 13:11:49
|
Line 1
|
Line 1
|
|
/************************************************************************* |
|
* (C) 2008 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com> |
|
* by Michael Pounov <misho@openbsd-bg.org> |
|
* |
|
* $Author$ |
|
* $Id$ |
|
* |
|
************************************************************************** |
|
The ELWIX and AITNET software is distributed under the following |
|
terms: |
|
|
|
All of the documentation and software included in the ELWIX and AITNET |
|
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
|
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
|
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
|
Redistribution and use in source and binary forms, with or without |
|
modification, are permitted provided that the following conditions |
|
are met: |
|
1. Redistributions of source code must retain the above copyright |
|
notice, this list of conditions and the following disclaimer. |
|
2. Redistributions in binary form must reproduce the above copyright |
|
notice, this list of conditions and the following disclaimer in the |
|
documentation and/or other materials provided with the distribution. |
|
3. All advertising materials mentioning features or use of this software |
|
must display the following acknowledgement: |
|
This product includes software developed by Michael Pounov <misho@elwix.org> |
|
ELWIX - Embedded LightWeight unIX and its contributors. |
|
4. Neither the name of AITNET nor the names of its contributors |
|
may be used to endorse or promote products derived from this software |
|
without specific prior written permission. |
|
|
|
THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND |
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
|
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
|
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
|
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
|
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
|
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
|
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
|
SUCH DAMAGE. |
|
*/ |
#include "global.h" |
#include "global.h" |
#include "aitcfg.h" |
#include "aitcfg.h" |
#include "tools.h" |
|
|
|
|
|
// cfgDbg() Debug/Log operation | static inline int |
static inline int cfgDbg(FILE *f, char *fmt, ...) | cfg_Write(FILE *f, char *fmt, ...) |
{ |
{ |
int ret = 0; |
int ret = 0; |
va_list lst; |
va_list lst; |
Line 16 static inline int cfgDbg(FILE *f, char *fmt, ...)
|
Line 60 static inline int cfgDbg(FILE *f, char *fmt, ...)
|
return ret; |
return ret; |
} |
} |
|
|
// ----------------------------------------- | 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; |
|
} |
|
|
|
|
/* |
/* |
* ReadConfig() Read from file and add new item to config list | * cfgReadConfig() - Read file and add new item at config root |
* @f = file resource | * |
* @cfg = Head list element | * @f = File resource |
* return: 0 ok; -1 error:: can`t allocate memory | * @cfg = Config root |
*/ | * return: -1 error or 0 ok |
int ReadConfig(FILE *f, sl_config * __restrict cfg) | */ |
| int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) |
{ |
{ |
u_char szLine[MAX_STR + 1]; | char line[BUFSIZ]; |
u_char szSection[MAX_STR + 1], *psAttr, *psVal; | struct tagCfg *av = NULL; |
int pos; | int flg = 0; |
struct tagPair *av; | char *psAttr, *psVal, szSection[STRSIZ] = { 0 }; |
|
|
memset(szSection, 0, MAX_STR + 1); |
|
while (!feof(f)) { |
while (!feof(f)) { |
memset(szLine, 0, MAX_STR + 1); | memset(line, 0, sizeof line); |
fgets((char*) szLine, MAX_STR, f); | fgets(line, sizeof line - 1, f); |
trim(szLine); | #ifdef SUPPORT_USER_EOF |
#ifdef __DEBUG | /* check for user end-of-file */ |
cfgDbg(stdout, "DEBUG:: RAW |%s|\n", szLine); | if (line[0] == '.' && line[1] == '\n') |
| break; |
#endif |
#endif |
|
if (!(psAttr = strpbrk(line, "\r\n"))) { |
|
/* skip line, too long */ |
|
continue; |
|
} else { |
|
*psAttr = 0; |
|
io_TrimStr(line); |
|
} |
|
|
// End of config | if (flg) { |
if (*szLine == '.') | /* continues line */ |
break; | if (!av) |
// Comment | continue; |
if (*szLine == '#' || *szLine == ';' || !*szLine) | else |
| psAttr = line + strlen(line) - 1; |
| if (*psAttr == '\\') |
| *psAttr = 0; |
| else |
| flg = 0; |
| /* concat line to value */ |
| AIT_SET_STRCAT(&av->cfg_val, line); |
| if (!flg) |
| io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val)); |
continue; |
continue; |
|
} |
|
|
#ifdef __DEBUG | /* *NEW PAIR* alloc new pair element */ |
cfgDbg(stdout, "DEBUG:: Clean |%s|\n", szLine); | av = malloc(sizeof(struct tagCfg)); |
#endif | if (!av) { |
| LOGERR; |
| return -1; |
| } else { |
| memset(av, 0, sizeof(struct tagCfg)); |
| CFG_RC_LOCK(cfg); |
| SLIST_INSERT_HEAD(cfg, av, cfg_next); |
| CFG_RC_UNLOCK(cfg); |
| } |
|
|
// Section | /* check for continues line */ |
if (*szLine == '[') { | psAttr = line + strlen(line) - 1; |
pos = strlen((char*) szLine) - 1; | if (*psAttr == '\\') { |
if (szLine[pos] != ']') { | *psAttr = 0; |
cfgDbg(stdout, "WARNING:: Ignore section %s ... not closed breket\n", szLine); | flg = 1; |
} else { | |
szLine[pos] = 0; | |
strncpy((char*) szSection, (char*) szLine + 1, MAX_STR); | |
#ifdef __DEBUG | |
cfgDbg(stdout, "DEBUG:: Section %s\n", szSection); | |
#endif | |
} | |
continue; | |
} |
} |
|
|
// Devide pairs | /* check for comment or empty line */ |
pos = strchr((char*) szLine, '=') ? strchr((char*) szLine, '=') - (char*) szLine : 0; | if (!*line || *line == '#' || *line == ';') { |
if (!pos) { | AIT_SET_STR(&av->cfg_val, line); |
cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine); | |
continue; |
continue; |
} else { | } |
av = malloc(sizeof(struct tagPair)); | /* section */ |
if (!av) { | if (*line == '[') { |
LOGERR; | AIT_SET_STR(&av->cfg_val, line); |
return -1; | psAttr = line + strlen(line) - 1; |
} else { | if (*psAttr == ']') { |
// added new element | *psAttr = 0; |
av->sle_next = cfg->slh_first; | flg = 0; |
cfg->slh_first = av; | strlcpy(szSection, line + 1, sizeof szSection); |
} | |
// added section name to element | |
if (*szSection) { | |
av->psSection = malloc(strlen((char*) szSection) + 1); | |
if (!av->psSection) { | |
LOGERR; | |
free(av); | |
return -1; | |
} else | |
strcpy((char*) av->psSection, (char*) szSection); | |
} else |
} else |
av->psSection = NULL; | ioDEBUG(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); |
| continue; |
| } else { |
| *psAttr = 0; |
| psVal = psAttr + 1; |
| psAttr = line; |
| } |
|
|
psAttr = szLine; | /* if exists, added section name to element */ |
psVal = (szLine + pos + 1); | if (*szSection) { |
szLine[pos] = 0; | AIT_SET_STR(&av->cfg_sec, szSection); |
rtrim(psAttr); | AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
ltrim(psVal); | io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); |
#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)); | |
#endif | |
// added attribute to element | |
av->psAttribute = malloc(strlen((char*) psAttr) + 1); | |
if (!av->psAttribute) { | |
LOGERR; | |
free(av->psSection); | |
free(av); | |
return -1; | |
} else | |
strcpy((char*) av->psAttribute, (char*) psAttr); | |
// added value to element | |
av->psValue = malloc(strlen((char*) psVal) + 1); | |
if (!av->psValue) { | |
LOGERR; | |
free(av->psAttribute); | |
free(av->psSection); | |
free(av); | |
return -1; | |
} else | |
strcpy((char*) av->psValue, (char*) psVal); | |
} |
} |
|
|
|
io_RTrimStr(psAttr); |
|
io_LTrimStr(psVal); |
|
if (!flg) |
|
io_UnquotStr(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); |
|
|
|
CFG_RC_LOCK(cfg); |
|
RB_INSERT(tagRC, cfg, av); |
|
CFG_RC_UNLOCK(cfg); |
} |
} |
|
|
return 0; |
return 0; |
} |
} |
|
|
/* |
/* |
* WriteConfig() Write to file from items in config list | * cfgWriteConfig() - Write config from memory |
* @f = file resource | * |
* @cfg = Head list element | * @f = File handle |
* return: 0 ok; -1 error:: can`t write to file | * @cfg = Config root |
*/ | * @whitespace = Additional whitespace characters to file |
int WriteConfig(FILE *f, sl_config * __restrict cfg) | * return: -1 error or 0 ok |
| */ |
| int |
| cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace) |
{ |
{ |
struct tagPair *av; | struct tagCfg *av; |
time_t tim; |
time_t tim; |
char szTime[MAX_STR + 1]; | char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; |
u_char szSection[MAX_STR + 1]; | |
|
|
bzero(szSection, MAX_STR + 1); | CFG_RC_LOCK(cfg); |
| _invertQueue(cfg); |
bzero(szTime, MAX_STR + 1); | SLIST_FOREACH(av, cfg, cfg_next) { |
time(&tim); | /* add +1 line for section [] */ |
strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); | if (!AIT_ISEMPTY(&av->cfg_sec) && |
if (!cfgDbg(f, "## Write Config :: %s\n#\n", szTime)) { | strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) { |
LOGERR; | strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
return -1; | if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) { |
} | |
| |
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; |
LOGERR; |
|
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
} |
} |
if (!av->psSection && *szSection) { | if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
bzero(szSection, MAX_STR + 1); | memset(szSection, 0, sizeof szSection); |
if (!cfgDbg(f, "\n[]\n")) { | if (!cfg_Write(f, "\n[]\n")) { |
LOGERR; |
LOGERR; |
|
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
} |
} |
|
|
if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) { | /* build line */ |
| memset(line, 0, sizeof line); |
| if (!AIT_ISEMPTY(&av->cfg_attr) && AIT_TYPE(&av->cfg_attr) == string) { |
| strlcpy(line, AIT_GET_STR(&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) |
| strlcat(line, AIT_GET_STR(&av->cfg_val), sizeof line); |
| |
| /* write */ |
| if (!cfg_Write(f, "%s\n", line)) { |
LOGERR; |
LOGERR; |
|
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} |
} |
} |
} |
|
_invertQueue(cfg); |
|
CFG_RC_UNLOCK(cfg); |
|
|
bzero(szTime, MAX_STR + 1); | if (whitespace) { |
time(&tim); | time(&tim); |
strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); | memset(line, 0, sizeof line); |
if (!cfgDbg(f, "\n#\n## Done. :: %s\n", szTime)) { | strftime(line, sizeof line, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
LOGERR; | cfg_Write(f, "\n## Config was saved at :: %s ##\n", line); |
| } |
| |
| return 0; |
| } |
| |
| /* |
| * cfgConcatConfig() - Concat two configs into one |
| * |
| * @cfg = Config root |
| * @add_cfg = Concated config will be destroy after merge |
| * return: -1 error or 0 ok |
| */ |
| int |
| cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
| { |
| struct tagCfg *item; |
| |
| if (!cfg || !add_cfg) |
return -1; |
return -1; |
|
|
|
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) |
|
RB_INSERT(tagRC, cfg, item); |
|
|
|
CFG_RC_UNLOCK(cfg); |
|
CFG_RC_UNLOCK(add_cfg); |
|
|
|
add_cfg->slh_first = NULL; |
|
add_cfg->rbh_root = NULL; |
|
pthread_mutex_destroy(&add_cfg->rc_mtx); |
|
return 0; |
|
} |
|
|
|
/* |
|
* cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg |
|
* |
|
* @cfg = Config root of main list |
|
* @add_cfg = Merged config will be destroy after merge |
|
* return: -1 error or 0 ok |
|
*/ |
|
int |
|
cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
|
{ |
|
struct tagCfg *item, *merge, *add_next, *next = NULL; |
|
int flg; |
|
|
|
if (!cfg || !add_cfg) |
|
return -1; |
|
|
|
CFG_RC_LOCK(add_cfg); |
|
CFG_RC_LOCK(cfg); |
|
SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { |
|
flg = 0; |
|
SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { |
|
if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { |
|
SLIST_INSERT_AFTER(merge, item, cfg_next); |
|
RB_INSERT(tagRC, cfg, item); |
|
flg = 1; |
|
break; |
|
} |
|
if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && |
|
!strcmp(AIT_GET_STR(&merge->cfg_sec), AIT_GET_STR(&item->cfg_sec))) { |
|
SLIST_INSERT_AFTER(merge, item, cfg_next); |
|
RB_INSERT(tagRC, cfg, item); |
|
flg = 1; |
|
break; |
|
} |
|
} |
|
|
|
if (!flg) { |
|
SLIST_INSERT_AFTER(merge, item, cfg_next); |
|
RB_INSERT(tagRC, cfg, item); |
|
} |
} |
} |
|
CFG_RC_UNLOCK(cfg); |
|
CFG_RC_UNLOCK(add_cfg); |
|
|
|
add_cfg->slh_first = NULL; |
|
add_cfg->rbh_root = NULL; |
|
pthread_mutex_destroy(&add_cfg->rc_mtx); |
return 0; |
return 0; |
} |
} |