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

Write the configuration only once

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-10 00:09:12 +02:00
parent 18b6343837
commit 63cbc19628
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/configctl.c
View File

@ -42,18 +42,26 @@ static int _usage(void);
/* functions */ /* functions */
/* configctl */ /* configctl */
static int _configctl_do(int verbose, char const * filename, static int _configctl_do(Config * config, int verbose, char const * section,
char const * section, char const * key, char const * value); char const * key, char const * value);
static int _configctl(int verbose, int write, char const * filename, int argc, static int _configctl(int verbose, int write, char const * filename, int argc,
char * argv[]) char * argv[])
{ {
int ret = 0; int ret = 0;
Config * config;
int i; int i;
char * section; char * section;
char * key; char * key;
char * value = NULL; char * value = NULL;
if((config = config_new()) == NULL)
return _error(PROGNAME, 1);
if(config_load(config, filename) != 0)
{
config_delete(config);
return _error(PROGNAME, 1);
}
for(i = 0; i < argc; i++) for(i = 0; i < argc; i++)
{ {
section = argv[i]; section = argv[i];
@ -66,23 +74,21 @@ static int _configctl(int verbose, int write, char const * filename, int argc,
*(key++) = '\0'; *(key++) = '\0';
if(write && (value = strchr(key, '=')) != NULL) if(write && (value = strchr(key, '=')) != NULL)
*(value++) = '\0'; *(value++) = '\0';
ret |= _configctl_do(verbose, filename, section, key, value); ret |= _configctl_do(config, verbose, section, key, value);
} }
return (ret == 0) ? 0 : 2; if(ret == 0 && write && config_save(config, filename) != 0)
ret = _error(PROGNAME, 1);
config_delete(config);
return ret;
} }
static int _configctl_do(int verbose, char const * filename, static int _configctl_do(Config * config, int verbose, char const * section,
char const * section, char const * key, char const * value) char const * key, char const * value)
{ {
int ret = 0; int ret = 0;
Config * config;
char const * p; char const * p;
if((config = config_new()) == NULL) if(value == NULL)
ret = _error(PROGNAME, 1);
if(config_load(config, filename) != 0)
ret = _error(PROGNAME, 1);
else if(value == NULL)
{ {
p = config_get(config, section, key); p = config_get(config, section, key);
if(verbose < 0) if(verbose < 0)
@ -95,12 +101,9 @@ static int _configctl_do(int verbose, char const * filename,
_configctl_print(verbose, section, key, value); _configctl_print(verbose, section, key, value);
if(config_set(config, section, key, value) != 0) if(config_set(config, section, key, value) != 0)
ret = _error(PROGNAME, 1); ret = _error(PROGNAME, 1);
if(config_save(config, filename) != 0)
ret = _error(PROGNAME, 1);
} }
else else
ret = _error(PROGNAME, 1); ret = _error(PROGNAME, 1);
config_delete(config);
return ret; return ret;
} }