version 1.6.4.1, 2012/04/02 14:39:02
|
version 1.6.4.5, 2012/04/04 11:43:05
|
Line 47 SUCH DAMAGE.
|
Line 47 SUCH DAMAGE.
|
#include "aitcfg.h" |
#include "aitcfg.h" |
|
|
|
|
#if 0 | static inline int |
// cfgDbg() Debug/Log operation | cfg_Write(FILE *f, char *fmt, ...) |
static inline int cfgDbg(FILE *f, char *fmt, ...) | |
{ |
{ |
int ret = 0; |
int ret = 0; |
va_list lst; |
va_list lst; |
Line 61 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) |
|
{ |
|
struct tagPair *av; |
|
time_t tim; |
|
char szTime[MAX_STR + 1]; |
|
u_char szSection[MAX_STR + 1]; |
|
|
|
bzero(szSection, MAX_STR + 1); |
|
|
|
bzero(szTime, MAX_STR + 1); |
|
time(&tim); |
|
strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
|
if (!cfgDbg(f, "## Write Config :: %s\n#\n", szTime)) { |
|
LOGERR; |
|
return -1; |
|
} |
|
|
|
InvertQueue(cfg); |
|
for (av = cfg->slh_first; av; av = av->sle_next) { |
|
if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) { |
|
strlcpy((char*) szSection, (char*) av->psSection, MAX_STR + 1); |
|
if (!cfgDbg(f, "\n[%s]\n", av->psSection)) { |
|
LOGERR; |
|
return -1; |
|
} |
|
} |
|
if (!av->psSection && *szSection) { |
|
bzero(szSection, MAX_STR + 1); |
|
if (!cfgDbg(f, "\n[]\n")) { |
|
LOGERR; |
|
return -1; |
|
} |
|
} |
|
|
|
if (whitespace) { |
|
if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) { |
|
LOGERR; |
|
return -1; |
|
} |
|
} else { |
|
if (!cfgDbg(f, "%s=%s\n", av->psAttribute, av->psValue)) { |
|
LOGERR; |
|
return -1; |
|
} |
|
} |
|
} |
|
InvertQueue(cfg); |
|
|
|
bzero(szTime, MAX_STR + 1); |
|
time(&tim); |
|
strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
|
if (!cfgDbg(f, "\n#\n## Done. :: %s\n", szTime)) { |
|
LOGERR; |
|
return -1; |
|
} |
|
|
|
return 0; |
|
} |
|
|
|
// --------------------------------------------------- |
|
#endif |
|
|
|
/* |
/* |
* cfgReadConfig() - Read file and add new item at config root |
* cfgReadConfig() - Read file and add new item at config root |
* |
* |
Line 258 int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
|
Line 191 int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
|
return 0; |
return 0; |
} |
} |
|
|
#if 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) |
{ |
{ |
return cfgWrite(f, cfg, 1); | struct tagCfg *av; |
} | time_t tim; |
| char szTime[STRSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; |
|
|
/* | time(&tim); |
* cfg_WriteConfig() Write to file from items in config list without whitespaces! | strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
* @f = file resource | if (!cfg_Write(f, "## Write Config :: %s\n#\n", szTime)) { |
* @cfg = Head list element | LOGERR; |
* return: 0 ok; -1 error:: can`t write to file | return -1; |
*/ | } |
int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg) | |
{ | CFG_RC_LOCK(cfg); |
return cfgWrite(f, cfg, 0); | _invertQueue(cfg); |
| SLIST_FOREACH(av, cfg, cfg_next) { |
| if (!AIT_ISEMPTY(&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))) { |
| LOGERR; |
| CFG_RC_UNLOCK(cfg); |
| return -1; |
| } |
| } |
| if (AIT_ISEMPTY(&av->cfg_sec) && *szSection) { |
| memset(szSection, 0, sizeof szSection); |
| if (!cfg_Write(f, "\n[]\n")) { |
| LOGERR; |
| CFG_RC_UNLOCK(cfg); |
| return -1; |
| } |
| } |
| |
| if (!cfg_Write(f, ((whitespace) ? "%s = %s\n" : "%s=%s\n"), |
| AIT_GET_STR(&av->cfg_attr, char*), AIT_GET_STR(&av->cfg_val))) { |
| LOGERR; |
| CFG_RC_UNLOCK(cfg); |
| return -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; |
} |
} |
|
|
/* |
/* |
* ConcatConfig() Concat two list in one | * cfgConcatConfig() - Concat two configs into one |
* @cfg = Head list element of main list | * |
* @add_cfg = Head list element of added list | * @cfg = Config root |
* return: 0 ok; -1 error:: can`t concat lists | * @add_cfg = Concated config will be destroy after merge |
*/ | * return: -1 error or 0 ok |
int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) | */ |
| int |
| cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
{ |
{ |
struct tagPair *item; | struct tagCfg *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; |
} |
} |
#endif |
|