GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-03-13 06:01:03 +00:00
Code Issues Releases Wiki Activity

Don't save 'include' when saving the configuration

Browse Source
This commit is contained in:
Kano 2012-02-23 01:44:41 +11:00
parent 915c72d8e7
commit ca2b2d9b9a
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -227,6 +227,7 @@ arguments and it will load your configuration.
Any configuration file may also contain a single
"include" : "filename"
to recursively include another configuration file.
Writing the configuration will save all settings from all files in the output.
Single pool, regular desktop:

9
cgminer.c
View File

@ -197,7 +197,6 @@ char *opt_socks_proxy = NULL;
static const char def_conf[] = "cgminer.conf";
static bool config_loaded = false;
static char *include_conf = NULL;
static int include_count = 0;
#define JSON_INCLUDE_CONF "include"
#define JSON_LOAD_ERROR "JSON decode of file '%s' failed"
@ -916,12 +915,8 @@ static char *parse_config(json_t *config, bool fileconf)
}
val = json_object_get(config, JSON_INCLUDE_CONF);
if (val && json_is_string(val)) {
if (include_conf == NULL)
include_conf = (char *)json_string_value(val);
if (val && json_is_string(val))
return load_config(json_string_value(val), NULL);
}
return NULL;
}
@ -2481,8 +2476,6 @@ void write_config(FILE *fcfg)
fprintf(fcfg, ",\n\"api-allow\" : \"%s\"", opt_api_allow);
if (strcmp(opt_api_description, PACKAGE_STRING) != 0)
fprintf(fcfg, ",\n\"api-description\" : \"%s\"", opt_api_description);
if (include_conf)
fprintf(fcfg, ",\n\"%s\" : \"%s\"", JSON_INCLUDE_CONF, include_conf);
fputs("\n}", fcfg);
}