mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix import of old broken Choices

This commit is contained in:
Vincent Sanders 2013-05-29 07:59:27 +01:00
parent 44f91c9fc8
commit a4f67018fa
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
utils/nsoption.c
View File

@ -133,8 +133,11 @@ strtooption(const char *value, struct nsoption_s *option)
} }
/* validate options to sane values */ /* validate options to sane values */
static void nsoption_validate(struct nsoption_s *opts) static void nsoption_validate(struct nsoption_s *opts, struct nsoption_s *defs)
{ {
int cloop;
bool black = true;
if (opts[NSOPTION_font_size].value.i < 50) { if (opts[NSOPTION_font_size].value.i < 50) {
opts[NSOPTION_font_size].value.i = 50; opts[NSOPTION_font_size].value.i = 50;
} }
@ -154,6 +157,27 @@ static void nsoption_validate(struct nsoption_s *opts)
if (opts[NSOPTION_memory_cache_size].value.i < 0) { if (opts[NSOPTION_memory_cache_size].value.i < 0) {
opts[NSOPTION_memory_cache_size].value.i = 0; opts[NSOPTION_memory_cache_size].value.i = 0;
} }
/* to aid migration from old, broken, configuration files this
* checks to see if all the system colours are set to black
* and returns them to defaults instead
*/
for (cloop = NSOPTION_SYS_COLOUR_START;
cloop <= NSOPTION_SYS_COLOUR_END;
cloop++) {
if (opts[cloop].value.c != 0) {
black = false;
break;
}
}
if (black == true) {
for (cloop = NSOPTION_SYS_COLOUR_START;
cloop <= NSOPTION_SYS_COLOUR_END;
cloop++) {
opts[cloop].value.c = defs[cloop].value.c;
}
}
} }
static bool static bool
@ -468,6 +492,7 @@ nsoption_read(const char *path, struct nsoption_s *opts)
{ {
char s[100]; char s[100];
FILE *fp; FILE *fp;
struct nsoption_s *defs;
if (path == NULL) { if (path == NULL) {
return NSERROR_BAD_PARAMETER; return NSERROR_BAD_PARAMETER;
@ -478,6 +503,9 @@ nsoption_read(const char *path, struct nsoption_s *opts)
opts = nsoptions; opts = nsoptions;
} }
/* @todo is this and API bug not being a parameter */
defs = nsoptions_default;
fp = fopen(path, "r"); fp = fopen(path, "r");
if (!fp) { if (!fp) {
LOG(("Failed to open file '%s'", path)); LOG(("Failed to open file '%s'", path));
@ -515,7 +543,7 @@ nsoption_read(const char *path, struct nsoption_s *opts)
fclose(fp); fclose(fp);
nsoption_validate(opts); nsoption_validate(opts, defs);
return NSERROR_OK; return NSERROR_OK;
} }