*/
#include <stdlib.h>
+#include <stddef.h>
#include <string.h>
#include "configfile.h"
{ "default_browser", SWB_CONFIG_OPT_STRING, SWB_CONFIG_DEFAULT_BROWSER_SET },
{ "other_browser_cmd", SWB_CONFIG_OPT_STRING, SWB_CONFIG_OTHER_BROWSER_CMD_SET },
{ "logging", SWB_CONFIG_OPT_STRING, SWB_CONFIG_LOGGING_SET },
+ { "autostart_microb", SWB_CONFIG_OPT_INT, SWB_CONFIG_AUTOSTART_MICROB_SET },
{ NULL, 0, 0 },
};
.default_browser = "microb",
.other_browser_cmd = NULL,
.logging = "stdout",
+ .autostart_microb = -1,
};
dst->entries[1] = &(dst->default_browser);
dst->entries[2] = &(dst->other_browser_cmd);
dst->entries[3] = &(dst->logging);
+ dst->entries[4] = &(dst->autostart_microb);
dst->flags = src->flags;
dst->default_browser = src->default_browser;
dst->other_browser_cmd = src->other_browser_cmd;
dst->logging = src->logging;
+ dst->autostart_microb = src->autostart_microb;
}
/* Initialize a swb_config struct with configuration defaults */
/* 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;
/* 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;
+ struct swb_config_option *opt;
+ ptrdiff_t i;
int retval = 0;
- for (i = 0; swb_config_options[i].name; ++i) {
- opt = swb_config_options[i];
- if (strcmp(name, opt.name))
+ 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;
free(value);
break;
}
- cfg->flags |= opt.set_mask;
+ cfg->flags |= opt->set_mask;
}
retval = 1;
break;