Commit ee21d3ba0c3f3b645a846d030cc9d3aa6d237054
2014-04-03T12:29:40
Store standard charp options when writing config files
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/cgminer.c b/cgminer.c
index 44222f6..c803f9c 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -4908,6 +4908,7 @@ static char *json_escape(char *str)
void write_config(FILE *fcfg)
{
+ struct opt_table *opt;
int i;
/* Write pool values */
@@ -4934,10 +4935,10 @@ void write_config(FILE *fcfg)
}
fputs("\n]\n", fcfg);
- /* Simple bool and int options */
- struct opt_table *opt;
+ /* Simple bool,int and char options */
for (opt = opt_config_table; opt->type != OPT_END; opt++) {
char *p, *name = strdup(opt->names);
+
for (p = strtok(name, "|"); p; p = strtok(NULL, "|")) {
if (p[1] != '-')
continue;
@@ -4957,7 +4958,17 @@ void write_config(FILE *fcfg)
(void *)opt->cb_arg == (void *)set_int_32_to_63) &&
opt->desc != opt_hidden)
fprintf(fcfg, ",\n\"%s\" : \"%d\"", p+2, *(int *)opt->u.arg);
+
+ if (opt->type & OPT_HASARG &&
+ ((void *)opt->cb_arg == (void *)opt_set_charp) &&
+ opt->desc != opt_hidden) {
+ const char *carg = *(char **)opt->u.arg;
+
+ if (carg)
+ fprintf(fcfg, ",\n\"%s\" : \"%s\"", p+2, carg);
+ }
}
+ free(name);
}
/* Special case options */