version 1.6, 2011/05/01 17:24:28
|
version 1.6.4.6, 2012/04/04 11:43:21
|
Line 12 terms:
|
Line 12 terms:
|
All of the documentation and software included in the ELWIX and AITNET |
All of the documentation and software included in the ELWIX and AITNET |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
Redistribution and use in source and binary forms, with or without |
Redistribution and use in source and binary forms, with or without |
Line 47 SUCH DAMAGE.
|
Line 47 SUCH DAMAGE.
|
#include "aitcfg.h" |
#include "aitcfg.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 60 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() InvertQueue order //{cfg} list of elements for revert | _invertQueue(cfg_root_t * __restrict cfg) |
* @cfg = Head list element for revert | |
*/ | |
static inline void InvertQueue(sl_config * __restrict cfg) | |
{ |
{ |
struct tagPair *item, *next, *prev = NULL; | struct tagCfg *item, *next, *prev = NULL; |
|
|
for (item = cfg->slh_first; item; item = next) { | SLIST_FOREACH_SAFE(item, cfg, cfg_next, next) { |
next = item->sle_next; | item->cfg_next.sle_next = prev; |
item->sle_next = prev; | |
prev = item; |
prev = item; |
} |
} |
cfg->slh_first = prev; |
cfg->slh_first = prev; |
} |
} |
|
|
// cfgWrite() Write to file from config list | |
static inline int cfgWrite(FILE *f, sl_config * __restrict cfg, int whitespace) | /* |
| * cfgReadConfig() - Read file and add new item at config root |
| * |
| * @f = File resource |
| * @cfg = Config root |
| * return: -1 error or 0 ok |
| */ |
| int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) |
{ |
{ |
struct tagPair *av; | char line[BUFSIZ]; |
time_t tim; | struct tagCfg *av = NULL; |
char szTime[MAX_STR + 1]; | int flg = 0; |
u_char szSection[MAX_STR + 1]; | char *psAttr, *psVal, szSection[STRSIZ] = { 0 }; |
|
|
bzero(szSection, MAX_STR + 1); | while (!feof(f)) { |
| memset(line, 0, sizeof line); |
| fgets(line, sizeof line - 1, f); |
| #ifdef SUPPORT_USER_EOF |
| /* check for user end-of-file */ |
| if (line[0] == '.' && line[1] == '\n') |
| break; |
| #endif |
| if (!(psAttr = strpbrk(line, "\r\n"))) { |
| /* skip line, too long */ |
| continue; |
| } else { |
| *psAttr = 0; |
| io_TrimStr(line); |
| } |
|
|
bzero(szTime, MAX_STR + 1); | if (flg) { |
time(&tim); | /* continues line */ |
strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); | if (!av) |
if (!cfgDbg(f, "## Write Config :: %s\n#\n", szTime)) { | continue; |
LOGERR; | else |
return -1; | 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; |
| } |
|
|
InvertQueue(cfg); | /* *NEW PAIR* alloc new pair element */ |
for (av = cfg->slh_first; av; av = av->sle_next) { | av = malloc(sizeof(struct tagCfg)); |
if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) { | if (!av) { |
strlcpy((char*) szSection, (char*) av->psSection, MAX_STR + 1); | LOGERR; |
if (!cfgDbg(f, "\n[%s]\n", av->psSection)) { | return -1; |
LOGERR; | } else { |
return -1; | memset(av, 0, sizeof(struct tagCfg)); |
} | CFG_RC_LOCK(cfg); |
| SLIST_INSERT_HEAD(cfg, av, cfg_next); |
| CFG_RC_UNLOCK(cfg); |
} |
} |
if (!av->psSection && *szSection) { | |
bzero(szSection, MAX_STR + 1); | /* check for continues line */ |
if (!cfgDbg(f, "\n[]\n")) { | psAttr = line + strlen(line) - 1; |
LOGERR; | if (*psAttr == '\\') { |
return -1; | *psAttr = 0; |
} | flg = 1; |
} |
} |
|
|
if (whitespace) { | /* check for comment or empty line */ |
if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) { | if (!*line || *line == '#' || *line == ';') { |
LOGERR; | AIT_SET_STR(&av->cfg_val, line); |
return -1; | continue; |
} | } |
| /* 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); |
| } else |
| 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 { |
} else { |
if (!cfgDbg(f, "%s=%s\n", av->psAttribute, av->psValue)) { | *psAttr = 0; |
LOGERR; | psVal = psAttr + 1; |
return -1; | psAttr = line; |
} | |
} |
} |
} |
|
InvertQueue(cfg); |
|
|
|
bzero(szTime, MAX_STR + 1); | /* if exists, added section name to element */ |
time(&tim); | if (*szSection) { |
strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); | AIT_SET_STR(&av->cfg_sec, szSection); |
if (!cfgDbg(f, "\n#\n## Done. :: %s\n", szTime)) { | AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
LOGERR; | io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); |
return -1; | } |
| |
| 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; |
} |
} |
|
|
// --------------------------------------------------- |
|
|
|
/* |
/* |
* ReadConfig() Read from file and add new item to config list | * cfgWriteConfig() - Write config from memory |
* @f = file resource | * |
* @cfg = Head list element | * @f = File handle |
* return: 0 ok; -1 error:: can`t allocate memory | * @cfg = Config root |
*/ | * @whitespace = Additional whitespace characters to file |
int ReadConfig(FILE *f, sl_config * __restrict cfg) | * return: -1 error or 0 ok |
| */ |
| int |
| cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace) |
{ |
{ |
u_char szLine[MAX_STR + 1]; | struct tagCfg *av; |
u_char szSection[MAX_STR + 1], *psAttr, *psVal; | time_t tim; |
int pos; | char szTime[STRSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; |
struct tagPair *av; | |
|
|
memset(szSection, 0, MAX_STR + 1); | time(&tim); |
while (!feof(f)) { | strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
memset(szLine, 0, MAX_STR + 1); | if (!cfg_Write(f, "## Write Config :: %s\n#\n", szTime)) { |
fgets((char*) szLine, MAX_STR, f); | LOGERR; |
io_TrimStr(szLine); | return -1; |
#ifdef __DEBUG | } |
cfgDbg(stdout, "DEBUG:: RAW |%s|\n", szLine); | |
#endif | |
|
|
// End of config | CFG_RC_LOCK(cfg); |
if (*szLine == '.') | _invertQueue(cfg); |
break; | SLIST_FOREACH(av, cfg, cfg_next) { |
// Comment | if (!AIT_ISEMPTY(&av->cfg_sec) && |
if (*szLine == '#' || *szLine == ';' || !*szLine) | strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) { |
continue; | strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection); |
| if (!cfg_Write(f, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) { |
#ifdef __DEBUG | LOGERR; |
cfgDbg(stdout, "DEBUG:: Clean |%s|\n", szLine); | CFG_RC_UNLOCK(cfg); |
#endif | return -1; |
| |
// Section | |
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); | |
#ifdef __DEBUG | |
cfgDbg(stdout, "DEBUG:: Section %s\n", szSection); | |
#endif | |
} |
} |
continue; |
|
} |
} |
| if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
// Devide pairs | memset(szSection, 0, sizeof szSection); |
pos = strchr((char*) szLine, '=') ? strchr((char*) szLine, '=') - (char*) szLine : 0; | if (!cfg_Write(f, "\n[]\n")) { |
if (!pos) { | |
#ifdef __DEBUG | |
cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine); | |
#endif | |
continue; | |
} else { | |
av = malloc(sizeof(struct tagPair)); | |
if (!av) { | |
LOGERR; |
LOGERR; |
|
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
} else { |
|
memset(av, 0, sizeof(struct tagPair)); |
|
// added new element |
|
av->sle_next = cfg->slh_first; |
|
cfg->slh_first = av; |
|
} |
} |
// added section name to element | } |
if (*szSection) { | |
av->psSection = malloc(strlen((char*) szSection) + 1); | |
if (!av->psSection) { | |
LOGERR; | |
free(av); | |
return -1; | |
} else | |
strlcpy((char*) av->psSection, (char*) szSection, strlen((char*) szSection) + 1); | |
} else | |
av->psSection = NULL; | |
|
|
psAttr = szLine; | if (!cfg_Write(f, ((whitespace) ? "%s = %s\n" : "%s=%s\n"), |
psVal = (szLine + pos + 1); | AIT_GET_STR(&av->cfg_attr), AIT_GET_STR(&av->cfg_val))) { |
szLine[pos] = 0; | LOGERR; |
io_RTrimStr(psAttr); | CFG_RC_UNLOCK(cfg); |
io_LTrimStr(psVal); | return -1; |
io_UnquotStr(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)); | |
#endif | |
// added attribute to element | |
av->psAttribute = malloc(strlen((char*) psAttr) + 1); | |
if (!av->psAttribute) { | |
LOGERR; | |
free(av->psSection); | |
free(av); | |
return -1; | |
} else | |
strlcpy((char*) av->psAttribute, (char*) psAttr, strlen((char*) psAttr) + 1); | |
// 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 | |
strlcpy((char*) av->psValue, (char*) psVal, strlen((char*) psVal) + 1); | |
} |
} |
} |
} |
|
_invertQueue(cfg); |
|
CFG_RC_UNLOCK(cfg); |
|
|
|
memset(szTime, 0, sizeof szTime); |
|
time(&tim); |
|
strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
|
if (!cfg_Write(f, "\n#\n## Done. :: %s\n", szTime)) { |
|
LOGERR; |
|
return -1; |
|
} |
|
|
return 0; |
return 0; |
} |
} |
|
|
/* |
/* |
* WriteConfig() Write to file from items in config list | * cfgConcatConfig() - Concat two configs into one |
* @f = file resource | * |
* @cfg = Head list element | * @cfg = Config root |
* return: 0 ok; -1 error:: can`t write to file | * @add_cfg = Concated config will be destroy after merge |
*/ | * return: -1 error or 0 ok |
int WriteConfig(FILE *f, sl_config * __restrict cfg) | */ |
| int |
| cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
{ |
{ |
return cfgWrite(f, cfg, 1); | struct tagCfg *item; |
} | |
|
|
/* |
|
* 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); |
|
} |
|
|
|
/* |
|
* 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) |
if (!cfg || !add_cfg) |
return -1; |
return -1; |
|
|
for (item = cfg->slh_first; item->sle_next; item = item->sle_next); | CFG_RC_LOCK(add_cfg); |
item->sle_next = add_cfg->slh_first; | CFG_RC_LOCK(cfg); |
|
|
add_cfg->slh_first = NULL; | /* 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); |
|
|
return ret; | /* 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; |
} |
} |
|
|
/* |
/* |
* MergeConfig() Marge two list in one cfg and destroy add_cfg | * cfgMergeConfig() - 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!) | * @cfg = Config root of main list |
* return: 0 ok; -1 error:: can`t merge lists | * @add_cfg = Merged config will be destroy after merge |
*/ | * return: -1 error or 0 ok |
int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) | */ |
| int |
| cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
{ |
{ |
struct tagPair *item, *merge, *add_next, *next = NULL; | struct tagCfg *item, *merge, *add_next, *next = NULL; |
int flg; |
int flg; |
|
|
if (!cfg || !add_cfg) |
if (!cfg || !add_cfg) |
return -1; |
return -1; |
|
|
item = add_cfg->slh_first; | CFG_RC_LOCK(add_cfg); |
while (item) { | CFG_RC_LOCK(cfg); |
add_next = item->sle_next; | SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { |
| flg = 0; |
for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; | SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { |
merge = merge->sle_next, next = merge->sle_next) { | if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { |
if (!merge->psSection && !item->psSection) { | SLIST_INSERT_AFTER(merge, item, cfg_next); |
| RB_INSERT(tagRC, cfg, item); |
flg = 1; |
flg = 1; |
merge->sle_next = item; |
|
item->sle_next = next; |
|
break; |
break; |
} |
} |
if (merge->psSection && item->psSection && | if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && |
!strcmp((char*) merge->psSection, (char*) item->psSection)) { | !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; |
flg = 1; |
merge->sle_next = item; |
|
item->sle_next = next; |
|
break; |
break; |
} |
} |
} |
} |
|
|
if (!flg) { |
if (!flg) { |
if (!merge->sle_next) { | SLIST_INSERT_AFTER(merge, item, cfg_next); |
merge->sle_next = item; | RB_INSERT(tagRC, cfg, item); |
item->sle_next = NULL; | |
} else | |
return -1; | |
} |
} |
|
|
item = add_next; |
|
} |
} |
|
CFG_RC_UNLOCK(cfg); |
|
CFG_RC_UNLOCK(add_cfg); |
|
|
add_cfg->slh_first = NULL; |
add_cfg->slh_first = NULL; |
| add_cfg->rbh_root = NULL; |
| pthread_mutex_destroy(&add_cfg->rc_mtx); |
return 0; |
return 0; |
} |
} |