version 1.6.4.5, 2012/04/04 11:43:05
|
version 1.6.4.8, 2012/04/04 13:10:56
|
Line 204 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 204 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
{ |
{ |
struct tagCfg *av; |
struct tagCfg *av; |
time_t tim; |
time_t tim; |
char szTime[STRSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; | char line[BUFSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; |
|
|
time(&tim); |
|
strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
|
if (!cfg_Write(f, "## Write Config :: %s\n#\n", szTime)) { |
|
LOGERR; |
|
return -1; |
|
} |
|
|
|
CFG_RC_LOCK(cfg); |
CFG_RC_LOCK(cfg); |
_invertQueue(cfg); |
_invertQueue(cfg); |
SLIST_FOREACH(av, cfg, cfg_next) { |
SLIST_FOREACH(av, cfg, cfg_next) { |
|
/* add +1 line for section [] */ |
if (!AIT_ISEMPTY(&av->cfg_sec) && |
if (!AIT_ISEMPTY(&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); |
Line 234 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 228 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
} |
} |
} |
} |
|
|
if (!cfg_Write(f, ((whitespace) ? "%s = %s\n" : "%s=%s\n"), | /* build line */ |
AIT_GET_STR(&av->cfg_attr, char*), AIT_GET_STR(&av->cfg_val))) { | memset(line, 0, sizeof line); |
| if (!AIT_ISEMPTY(&av->cfg_attr) && AIT_TYPE(&av->cfg_attr) == string) { |
| strlcpy(line, AIT_GET_STR(&av->cfg_attr), sizeof line); |
| if (whitespace) |
| strlcat(line, " = ", sizeof line); |
| else |
| strlcat(line, "=", sizeof line); |
| } |
| if (!AIT_ISEMPTY(&av->cfg_val) && AIT_TYPE(&av->cfg_val) == string) |
| strlcat(line, AIT_GET_STR(&av->cfg_val), sizeof line); |
| |
| /* write */ |
| if (!cfg_Write(f, "%s\n", line)) { |
LOGERR; |
LOGERR; |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
Line 244 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 250 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
_invertQueue(cfg); |
_invertQueue(cfg); |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
|
|
memset(szTime, 0, sizeof szTime); | if (whitespace) { |
time(&tim); | time(&tim); |
strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); | memset(line, 0, sizeof line); |
if (!cfg_Write(f, "\n#\n## Done. :: %s\n", szTime)) { | strftime(line, sizeof line, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
LOGERR; | cfg_Write(f, "\n## Config was saved at :: %s ##\n", line); |
return -1; | |
} |
} |
|
|
return 0; |
return 0; |