version 1.1, 2008/08/28 13:17:41
|
version 1.3, 2009/10/19 15:00:10
|
Line 1
|
Line 1
|
|
/************************************************************************* |
|
* (C) 2008 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com> |
|
* by Michael Pounov <misho@openbsd-bg.org> |
|
* |
|
* $Author$ |
|
* $Id$ |
|
* |
|
*************************************************************************/ |
#include "global.h" |
#include "global.h" |
#include "aitcfg.h" |
#include "aitcfg.h" |
#include "tools.h" |
#include "tools.h" |
Line 16 static inline int cfgDbg(FILE *f, char *fmt, ...)
|
Line 24 static inline int cfgDbg(FILE *f, char *fmt, ...)
|
return ret; |
return ret; |
} |
} |
|
|
// ----------------------------------------- | /* |
| * InvertQueue() InvertQueue order //{cfg} list of elements for revert |
| * @cfg = Head list element for revert |
| */ |
| static inline void InvertQueue(sl_config * __restrict cfg) |
| { |
| struct tagPair *item, *next, *prev = NULL; |
|
|
|
for (item = cfg->slh_first; item; item = next) { |
|
next = item->sle_next; |
|
item->sle_next = prev; |
|
prev = item; |
|
} |
|
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; |
|
} |
|
|
|
// --------------------------------------------------- |
|
|
/* |
/* |
* ReadConfig() Read from file and add new item to config list |
* ReadConfig() Read from file and add new item to config list |
* @f = file resource |
* @f = file resource |
Line 55 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
Line 139 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
if (*szLine == '[') { |
if (*szLine == '[') { |
pos = strlen((char*) szLine) - 1; |
pos = strlen((char*) szLine) - 1; |
if (szLine[pos] != ']') { |
if (szLine[pos] != ']') { |
|
#ifdef __DEBUG |
cfgDbg(stdout, "WARNING:: Ignore section %s ... not closed breket\n", szLine); |
cfgDbg(stdout, "WARNING:: Ignore section %s ... not closed breket\n", szLine); |
|
#endif |
} else { |
} else { |
szLine[pos] = 0; |
szLine[pos] = 0; |
strncpy((char*) szSection, (char*) szLine + 1, MAX_STR); |
strncpy((char*) szSection, (char*) szLine + 1, MAX_STR); |
Line 69 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
Line 155 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
// Devide pairs |
// Devide pairs |
pos = strchr((char*) szLine, '=') ? strchr((char*) szLine, '=') - (char*) szLine : 0; |
pos = strchr((char*) szLine, '=') ? strchr((char*) szLine, '=') - (char*) szLine : 0; |
if (!pos) { |
if (!pos) { |
|
#ifdef __DEBUG |
cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine); |
cfgDbg(stdout, "WARNING:: Ignore a/v %s ... format error!\n", szLine); |
|
#endif |
continue; |
continue; |
} else { |
} else { |
av = malloc(sizeof(struct tagPair)); |
av = malloc(sizeof(struct tagPair)); |
Line 77 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
Line 165 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} else { |
} else { |
|
memset(av, 0, sizeof(struct tagPair)); |
// added new element |
// added new element |
av->sle_next = cfg->slh_first; |
av->sle_next = cfg->slh_first; |
cfg->slh_first = av; |
cfg->slh_first = av; |
Line 89 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
Line 178 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
free(av); |
free(av); |
return -1; |
return -1; |
} else |
} else |
strcpy((char*) av->psSection, (char*) szSection); | strlcpy((char*) av->psSection, (char*) szSection, strlen((char*) szSection) + 1); |
} else |
} else |
av->psSection = NULL; |
av->psSection = NULL; |
|
|
Line 110 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
Line 199 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
free(av); |
free(av); |
return -1; |
return -1; |
} else |
} else |
strcpy((char*) av->psAttribute, (char*) psAttr); | strlcpy((char*) av->psAttribute, (char*) psAttr, strlen((char*) psAttr) + 1); |
// added value to element |
// added value to element |
av->psValue = malloc(strlen((char*) psVal) + 1); |
av->psValue = malloc(strlen((char*) psVal) + 1); |
if (!av->psValue) { |
if (!av->psValue) { |
Line 120 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
Line 209 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
free(av); |
free(av); |
return -1; |
return -1; |
} else |
} else |
strcpy((char*) av->psValue, (char*) psVal); | strlcpy((char*) av->psValue, (char*) psVal, strlen((char*) psVal) + 1); |
} |
} |
} |
} |
|
|
Line 135 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
Line 224 int ReadConfig(FILE *f, sl_config * __restrict cfg)
|
*/ |
*/ |
int WriteConfig(FILE *f, sl_config * __restrict cfg) |
int WriteConfig(FILE *f, sl_config * __restrict cfg) |
{ |
{ |
struct tagPair *av; | return cfgWrite(f, cfg, 1); |
time_t tim; | } |
char szTime[MAX_STR + 1]; | |
u_char szSection[MAX_STR + 1]; | |
|
|
bzero(szSection, MAX_STR + 1); | /* |
| * 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); |
| } |
|
|
bzero(szTime, MAX_STR + 1); | /* |
time(&tim); | * ConcatConfig() Concat two list in one |
strftime(szTime, MAX_STR, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); | * @cfg = Head list element of main list |
if (!cfgDbg(f, "## Write Config :: %s\n#\n", szTime)) { | * @add_cfg = Head list element of added list |
LOGERR; | * 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) |
return -1; |
return -1; |
} |
|
|
|
for (av = cfg->slh_first; av; av = av->sle_next) { | for (item = cfg->slh_first; item->sle_next; item = item->sle_next); |
if (av->psSection && strcmp((char*) av->psSection, (char*) szSection)) { | item->sle_next = add_cfg->slh_first; |
bzero(szSection, MAX_STR + 1); | |
strcpy((char*) szSection, (char*) av->psSection); | add_cfg->slh_first = NULL; |
if (!cfgDbg(f, "\n[%s]\n", av->psSection)) { | |
LOGERR; | return ret; |
return -1; | } |
| |
| /* |
| * MergeConfig() 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!) |
| * return: 0 ok; -1 error:: can`t merge lists |
| */ |
| int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) |
| { |
| struct tagPair *item, *merge, *add_next, *next = NULL; |
| int flg; |
| |
| if (!cfg || !add_cfg) |
| return -1; |
| |
| item = add_cfg->slh_first; |
| while (item) { |
| add_next = item->sle_next; |
| |
| for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; |
| merge = merge->sle_next, next = merge->sle_next) { |
| if (!merge->psSection && !item->psSection) { |
| flg = 1; |
| merge->sle_next = item; |
| item->sle_next = next; |
| break; |
} |
} |
} | if (merge->psSection && item->psSection && |
if (!av->psSection && *szSection) { | !strcmp((char*) merge->psSection, (char*) item->psSection)) { |
bzero(szSection, MAX_STR + 1); | flg = 1; |
if (!cfgDbg(f, "\n[]\n")) { | merge->sle_next = item; |
LOGERR; | item->sle_next = next; |
return -1; | break; |
} |
} |
} |
} |
|
|
if (!cfgDbg(f, "%s = %s\n", av->psAttribute, av->psValue)) { | if (!flg) { |
LOGERR; | if (!merge->sle_next) { |
return -1; | merge->sle_next = item; |
| item->sle_next = NULL; |
| } else |
| return -1; |
} |
} |
} |
|
|
|
bzero(szTime, MAX_STR + 1); | item = add_next; |
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; | |
} |
} |
|
|
|
add_cfg->slh_first = NULL; |
|
|
return 0; |
return 0; |
} |
} |