version 1.6.4.6, 2012/04/04 11:43:21
|
version 1.6.4.7, 2012/04/04 12:44:48
|
Line 205 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 205 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 szTime[STRSIZ] = { 0 }, szSection[STRSIZ] = { 0 }; |
|
char line[BUFSIZ]; |
|
|
time(&tim); |
time(&tim); |
strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
strftime(szTime, sizeof szTime, "(UTC) %Y-%m-%d %H:%M:%S", gmtime(&tim)); |
Line 216 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 217 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
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 236 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), 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; |