DeforaOS/libSystem
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid spurious lines when writing configuration files

Browse Source
This commit is contained in:
Pierre Pronchery 2015-06-18 01:15:12 -04:00
parent 19bbc4b7c6
commit 1b3d84b41b
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/config.c
View File

@ -45,6 +45,12 @@ typedef struct _ConfigForeachSectionData
void * priv; void * priv;
} ConfigForeachSectionData; } ConfigForeachSectionData;
typedef struct _ConfigSave
{
FILE * fp;
char const * sep;
} ConfigSave;
/* public */ /* public */
/* functions */ /* functions */
@ -110,6 +116,9 @@ int config_set(Config * config, char const * section, char const * variable,
#endif #endif
if(section == NULL) if(section == NULL)
section = ""; section = "";
if(variable == NULL || string_length(variable) == 0)
return error_set_code(-EINVAL, "variable: %s",
strerror(EINVAL));
if((mutator = mutator_get(config, section)) == NULL) if((mutator = mutator_get(config, section)) == NULL)
{ {
/* create a new section */ /* create a new section */
@ -380,13 +389,14 @@ static void _save_foreach_section(char const * key, void * value, void * data);
int config_save(Config * config, char const * filename) int config_save(Config * config, char const * filename)
{ {
FILE * fp; ConfigSave save;
if((fp = fopen(filename, "w")) == NULL) save.sep = "";
if((save.fp = fopen(filename, "w")) == NULL)
return error_set_code(1, "%s: %s", filename, strerror(errno)); return error_set_code(1, "%s: %s", filename, strerror(errno));
mutator_foreach(config, _save_foreach_default, &fp); mutator_foreach(config, _save_foreach_default, &save);
mutator_foreach(config, _save_foreach, &fp); mutator_foreach(config, _save_foreach, &save);
if(fp == NULL || fclose(fp) != 0) if(save.fp == NULL || fclose(save.fp) != 0)
return error_set_code(1, "%s: %s", filename, strerror(errno)); return error_set_code(1, "%s: %s", filename, strerror(errno));
return 0; return 0;
} }
@ -394,44 +404,45 @@ int config_save(Config * config, char const * filename)
static void _save_foreach_default(char const * section, void * value, static void _save_foreach_default(char const * section, void * value,
void * data) void * data)
{ {
FILE ** fp = data; ConfigSave * save = data;
Mutator * mutator = value; Mutator * mutator = value;
if(*fp == NULL) if(save->fp == NULL)
return; return;
if(section[0] != '\0') if(section[0] != '\0')
return; return;
mutator_foreach(mutator, _save_foreach_section, fp); mutator_foreach(mutator, _save_foreach_section, save);
} }
static void _save_foreach(char const * section, void * value, void * data) static void _save_foreach(char const * section, void * value, void * data)
{ {
FILE ** fp = data; ConfigSave * save = data;
Mutator * mutator = value; Mutator * mutator = value;
if(*fp == NULL) if(save->fp == NULL)
return; return;
if(section[0] == '\0') if(section[0] == '\0')
return; return;
if(fprintf(*fp, "\n[%s]\n", section) < 0) if(fprintf(save->fp, "%s[%s]\n", save->sep, section) < 0)
{ {
fclose(*fp); fclose(save->fp);
*fp = NULL; save->fp = NULL;
return; return;
} }
mutator_foreach(mutator, _save_foreach_section, fp); save->sep = "\n";
mutator_foreach(mutator, _save_foreach_section, save);
} }
static void _save_foreach_section(char const * key, void * value, void * data) static void _save_foreach_section(char const * key, void * value, void * data)
{ {
FILE ** fp = data; ConfigSave * save = data;
char const * val = value; char const * val = value;
if(*fp == NULL) if(save->fp == NULL)
return; return;
/* FIXME escape lines with a backslash */ /* FIXME escape lines with a backslash */
if(val == NULL || fprintf(*fp, "%s=%s\n", key, val) >= 0) if(val == NULL || fprintf(save->fp, "%s=%s\n", key, val) >= 0)
return; return;
fclose(*fp); fclose(save->fp);
*fp = NULL; save->fp = NULL;
} }