version 1.8, 2012/07/22 21:54:47
|
version 1.10, 2012/08/06 14:53:34
|
Line 80 _invertQueue(cfg_root_t * __restrict cfg)
|
Line 80 _invertQueue(cfg_root_t * __restrict cfg)
|
* @cfg = Config root |
* @cfg = Config root |
* return: -1 error or 0 ok |
* return: -1 error or 0 ok |
*/ |
*/ |
int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) | int |
| cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg) |
{ |
{ |
char line[BUFSIZ]; |
char line[BUFSIZ]; |
struct tagCfg *av = NULL; |
struct tagCfg *av = NULL; |
Line 115 int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
|
Line 116 int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
|
flg = 0; |
flg = 0; |
/* concat line to value */ |
/* concat line to value */ |
AIT_SET_STRCAT(&av->cfg_val, line); |
AIT_SET_STRCAT(&av->cfg_val, line); |
if (!flg) | if (!flg && AIT_ADDR(&av->cfg_val)) |
io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val)); |
io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val)); |
continue; |
continue; |
} |
} |
Line 210 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 211 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
_invertQueue(cfg); |
_invertQueue(cfg); |
SLIST_FOREACH(av, cfg, cfg_next) { |
SLIST_FOREACH(av, cfg, cfg_next) { |
/* add +1 line for section [] */ |
/* add +1 line for section [] */ |
if (!AIT_ISEMPTY(&av->cfg_sec) && | if (!AIT_ISEMPTY(&av->cfg_sec) && AIT_ADDR(&av->cfg_sec) && |
strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) { |
strcmp(AIT_GET_STR(&av->cfg_sec), szSection)) { |
strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof 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, "\n[%s]\n", AIT_GET_STR(&av->cfg_sec))) { |
Line 230 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 231 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
|
|
/* build line */ |
/* build line */ |
memset(line, 0, sizeof line); |
memset(line, 0, sizeof line); |
if (!AIT_ISEMPTY(&av->cfg_attr) && AIT_TYPE(&av->cfg_attr) == string) { | if (!AIT_ISEMPTY(&av->cfg_attr) && AIT_TYPE(&av->cfg_attr) == string && |
| AIT_ADDR(&av->cfg_attr)) { |
strlcpy(line, AIT_GET_STR(&av->cfg_attr), sizeof line); |
strlcpy(line, AIT_GET_STR(&av->cfg_attr), sizeof line); |
if (whitespace) |
if (whitespace) |
strlcat(line, " = ", sizeof line); |
strlcat(line, " = ", sizeof line); |
else |
else |
strlcat(line, "=", sizeof line); |
strlcat(line, "=", sizeof line); |
} |
} |
if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) | if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string && |
| AIT_ADDR(&av->cfg_val)) |
strlcat(line, AIT_GET_STR(&av->cfg_val), sizeof line); |
strlcat(line, AIT_GET_STR(&av->cfg_val), sizeof line); |
|
|
/* write */ |
/* write */ |
Line 305 cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_
|
Line 308 cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_
|
int |
int |
cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
{ |
{ |
struct tagCfg *item, *merge, *add_next, *next = NULL; | struct tagCfg *item, *merge, *add_next, *next; |
int flg; |
int flg; |
|
|
if (!cfg || !add_cfg) |
if (!cfg || !add_cfg) |
Line 313 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
Line 316 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
|
|
CFG_RC_LOCK(add_cfg); |
CFG_RC_LOCK(add_cfg); |
CFG_RC_LOCK(cfg); |
CFG_RC_LOCK(cfg); |
|
|
|
/* merge lists */ |
SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { |
SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { |
flg = 0; |
flg = 0; |
SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { |
SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { |
if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { |
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; |
flg = 1; |
break; |
break; |
} |
} |
if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && |
if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && |
|
AIT_ADDR(&merge->cfg_sec) && AIT_ADDR(&item->cfg_sec) && |
!strcmp(AIT_GET_STR(&merge->cfg_sec), AIT_GET_STR(&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; |
flg = 1; |
break; |
break; |
} |
} |
} |
} |
|
|
if (!flg) { | if (!flg) |
| SLIST_INSERT_HEAD(cfg, item, cfg_next); |
| else |
SLIST_INSERT_AFTER(merge, item, cfg_next); |
SLIST_INSERT_AFTER(merge, item, cfg_next); |
RB_INSERT(tagRC, cfg, item); | RB_INSERT(tagRC, cfg, item); |
} | |
} |
} |
|
|
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(add_cfg); |
CFG_RC_UNLOCK(add_cfg); |
|
|
Line 344 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
Line 348 cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
|
pthread_mutex_destroy(&add_cfg->rc_mtx); |
pthread_mutex_destroy(&add_cfg->rc_mtx); |
return 0; |
return 0; |
} |
} |
|
|
|
/* |
|
* cfgReadLines() - Read custom lines and add new item at config root |
|
* |
|
* @f = File resource |
|
* @delim = Custom delimiter, if =NULL default is '=' |
|
* @end = Custom user end of file, if =NULL default is EOF |
|
* @cfg = Config root |
|
* return: -1 error or 0 ok |
|
*/ |
|
int |
|
cfgReadLines(FILE *f, const char *delim, const char *end, cfg_root_t * __restrict cfg) |
|
{ |
|
char line[BUFSIZ]; |
|
struct tagCfg *d, *av = NULL; |
|
char *psAttr, *psVal = NULL; |
|
|
|
while (!feof(f)) { |
|
memset(line, 0, sizeof line); |
|
fgets(line, sizeof line - 1, f); |
|
/* check for user end-of-file */ |
|
if (strspn(line, end)) |
|
break; |
|
|
|
if (!(psAttr = strpbrk(line, "\r\n"))) { |
|
/* skip line, too long */ |
|
continue; |
|
} else { |
|
*psAttr = 0; |
|
io_TrimStr(line); |
|
if (!*line) |
|
continue; |
|
} |
|
|
|
if (!io_MakeAV2(line, delim, &psAttr, &psVal)) |
|
continue; |
|
else { |
|
io_LTrimStr(psVal); |
|
io_RTrimStr(psAttr); |
|
} |
|
|
|
/* *NEW PAIR* alloc new pair element */ |
|
av = io_malloc(sizeof(struct tagCfg)); |
|
if (!av) { |
|
LOGERR; |
|
return -1; |
|
} else |
|
memset(av, 0, sizeof(struct tagCfg)); |
|
|
|
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); |
|
|
|
CFG_RC_LOCK(cfg); |
|
/* find & delete duplicates */ |
|
if ((d = RB_FIND(tagRC, cfg, av))) { |
|
RB_REMOVE(tagRC, cfg, d); |
|
SLIST_REMOVE(cfg, d, tagCfg, cfg_next); |
|
|
|
AIT_FREE_VAL(&d->cfg_val); |
|
AIT_FREE_VAL(&d->cfg_attr); |
|
AIT_FREE_VAL(&d->cfg_sec); |
|
io_free(d); |
|
} |
|
|
|
SLIST_INSERT_HEAD(cfg, av, cfg_next); |
|
RB_INSERT(tagRC, cfg, av); |
|
CFG_RC_UNLOCK(cfg); |
|
} |
|
|
|
return 0; |
|
} |
|
|