X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config.c;h=7fe6874d1c86a1e1617a9ea0c6ae509158de6046;hp=727287fd3632cd27abc9a931e4e28c0600e0338c;hb=4e09868aec19cdc25a5d991fff8d93ec90c013d8;hpb=477b01a24f842c98e8abac56e3fe2ffb3d3a56db

diff --git a/config.c b/config.c
index 727287f..7fe6874 100644
--- a/config.c
+++ b/config.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 
 #include "configfile.h"
@@ -38,7 +39,7 @@ struct swb_config_option swb_config_options[] = {
 /* Browser Switchboard configuration defaults */
 static struct swb_config swb_config_defaults = {
 	.flags = SWB_CONFIG_INITIALIZED,
-	.continuous_mode = 0,
+	.continuous_mode = 1,
 	.default_browser = "microb",
 	.other_browser_cmd = NULL,
 	.logging = "stdout",
@@ -72,22 +73,24 @@ void swb_config_init(struct swb_config *cfg) {
 /* Free all heap memory used in an swb_config struct
    This MUST NOT be done if any of the strings are being used elsewhere! */
 void swb_config_free(struct swb_config *cfg) {
+	int i;
+
 	if (!cfg)
 		return;
 	if (!(cfg->flags & SWB_CONFIG_INITIALIZED))
 		return;
 
-	if (cfg->flags & SWB_CONFIG_DEFAULT_BROWSER_SET) {
-		free(cfg->default_browser);
-		cfg->default_browser = NULL;
-	}
-	if (cfg->flags & SWB_CONFIG_OTHER_BROWSER_CMD_SET) {
-		free(cfg->other_browser_cmd);
-		cfg->other_browser_cmd = NULL;
-	}
-	if (cfg->flags & SWB_CONFIG_LOGGING_SET) {
-		free(cfg->logging);
-		cfg->logging = NULL;
+	for (i = 0; swb_config_options[i].name; ++i) {
+		if (cfg->flags & swb_config_options[i].set_mask) {
+			switch (swb_config_options[i].type) {
+			  case SWB_CONFIG_OPT_STRING:
+				free(*(char **)cfg->entries[i]);
+				*(char **)cfg->entries[i] = NULL;
+				break;
+			  default:
+				break;
+			}
+		}
 	}
 
 	cfg->flags = 0;
@@ -96,35 +99,37 @@ void swb_config_free(struct swb_config *cfg) {
 /* Load a value into the part of a struct swb_config indicated by name */
 static int swb_config_load_option(struct swb_config *cfg,
 				  char *name, char *value) {
-	int i;
-	struct swb_config_option opt;
-	int retval = 0;
+	struct swb_config_option *opt;
+	ptrdiff_t i;
 
-	for (i = 0; swb_config_options[i].name; ++i) {
-		opt = swb_config_options[i];
-		if (strcmp(name, opt.name))
+	/* Search through list of recognized config options for a match */
+	for (opt = swb_config_options; opt->name; ++opt) {
+		if (strcmp(name, opt->name))
 			continue;
 
-		if (!(cfg->flags & opt.set_mask)) {
-			switch (opt.type) {
+		if (!(cfg->flags & opt->set_mask)) {
+			i = opt - swb_config_options;
+			switch (opt->type) {
 			  case SWB_CONFIG_OPT_STRING:
-				  *(char **)cfg->entries[i] = value;
-				  break;
+				*(char **)cfg->entries[i] = value;
+				break;
 			  case SWB_CONFIG_OPT_INT:
-				  *(int *)cfg->entries[i] = atoi(value);
-				  free(value);
-				  break;
+				*(int *)cfg->entries[i] = atoi(value);
+				free(value);
+				break;
 			}
-			cfg->flags |= opt.set_mask;
+			cfg->flags |= opt->set_mask;
+		} else {
+			/* Option was repeated in the config file
+			   We want the first value, so ignore this one */
+			free(value);
 		}
-		retval = 1;
-		break;
+		return 1;
 	}
 
-	if (!retval)
-		free(value);
-
-	return retval;
+	/* Unrecognized config option */
+	free(value);
+	return 0;
 }
 
 /* Read the config file and load settings into the provided swb_config struct