version 1.6, 2011/05/01 17:24:28
|
version 1.6.4.1, 2012/04/02 14:39:02
|
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" |
|
|
|
|
|
#if 0 |
// cfgDbg() Debug/Log operation |
// cfgDbg() Debug/Log operation |
static inline int cfgDbg(FILE *f, char *fmt, ...) |
static inline int cfgDbg(FILE *f, char *fmt, ...) |
{ |
{ |
Line 137 static inline int cfgWrite(FILE *f, sl_config * __rest
|
Line 138 static inline int cfgWrite(FILE *f, sl_config * __rest
|
} |
} |
|
|
// --------------------------------------------------- |
// --------------------------------------------------- |
|
#endif |
|
|
/* |
/* |
* 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); |
io_TrimStr(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; |
#ifdef __DEBUG | flg = 1; |
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; | |
} |
} |
|
|
// 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); |
#ifdef __DEBUG | |
cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine); | |
#endif | |
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 == ']') { |
memset(av, 0, sizeof(struct tagPair)); | *psAttr = 0; |
// added new element | flg = 0; |
av->sle_next = cfg->slh_first; | strlcpy(szSection, line + 1, sizeof szSection); |
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 |
} 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); |
io_RTrimStr(psAttr); | AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
io_LTrimStr(psVal); | io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); |
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); | |
} |
} |
|
|
|
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; |
} |
} |
|
|
|
#if 0 |
/* |
/* |
* WriteConfig() Write to file from items in config list |
* WriteConfig() Write to file from items in config list |
* @f = file resource |
* @f = file resource |
Line 347 int MergeConfig(sl_config * __restrict cfg, sl_config
|
Line 353 int MergeConfig(sl_config * __restrict cfg, sl_config
|
|
|
return 0; |
return 0; |
} |
} |
|
#endif |