hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Tweak configuration loading. 

SVN revision: 44955
This commit is contained in:
Kim Woelders 2010-01-07 16:42:23 +00:00
parent c0c53f291c
commit 565fd93dfe
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/econfig.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2009 Kim Woelders
* Copyright (C) 2004-2010 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -151,7 +151,7 @@ ECfgFileFindValue(ECfgFile * ecf, const char *key)
*/
static void
CfgItemLoad(ECfgFile * ecf, const char *prefix, const CfgItem * ci)
CfgItemLoad(ECfgFile * ecf, const char *prefix, const CfgItem * ci, int dflt)
{
char buf[1024];
const char *name = buf;
@ -169,7 +169,8 @@ CfgItemLoad(ECfgFile * ecf, const char *prefix, const CfgItem * ci)
return;
value = (ecf) ? ECfgFileFindValue(ecf, name) : NULL;
CfgItemSetFromString(ci, value, 1);
if (value || dflt)
CfgItemSetFromString(ci, value, 1);
}
static void
@ -200,22 +201,21 @@ ConfigurationGetFile(char *buf, int len)
return buf;
}
void
ConfigurationLoad(void)
static void
_ConfigurationLoad(const char *file, int dflt)
{
int i, nml, j, ncl;
const EModule *const *pml, *pm;
const CfgItem *pcl;
char buf[4096];
ECfgFile *ecf;
if (EDebug(EDBUG_TYPE_CONFIG))
Eprintf("ConfigurationLoad\n");
memset(&Conf, 0, sizeof(EConf));
ecf = e16_db_open_read(ConfigurationGetFile(buf, sizeof(buf)));
ecf = e16_db_open_read(file);
/* NB! We have to assign the defaults even if it doesn't exist */
if (!ecf && !dflt)
return;
/* Load module configs */
MODULE_LIST_GET(pml, nml);
@ -225,7 +225,7 @@ ConfigurationLoad(void)
ncl = pm->cfg.num;
pcl = pm->cfg.lst;
for (j = 0; j < ncl; j++)
CfgItemLoad(ecf, pm->name, pcl + j);
CfgItemLoad(ecf, pm->name, pcl + j, dflt);
}
MODULE_LIST_FREE(pml);
@ -233,6 +233,16 @@ ConfigurationLoad(void)
e16_db_close(ecf);
}
void
ConfigurationLoad(void)
{
char buf[4096];
memset(&Conf, 0, sizeof(EConf));
_ConfigurationLoad(ConfigurationGetFile(buf, sizeof(buf)), 1);
}
void
ConfigurationSave(void)
{