jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Use configured paths when accessing settings files

Browse source
This commit is contained in:
Erik Johansson 2012-03-13 15:00:07 +01:00
parent e5c2a9c847
commit 104ce0fb23
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
telldus-core/service/SettingsConfuse.cpp
View file

@ -10,6 +10,7 @@
// //
// //
#include "Settings.h" #include "Settings.h"
#include "SettingsConfusePaths.h"
#include "../client/telldus-core.h" #include "../client/telldus-core.h"
#include "Strings.h" #include "Strings.h"
#include <confuse.h> #include <confuse.h>
@ -28,12 +29,8 @@ public:
bool readConfig(cfg_t **cfg); bool readConfig(cfg_t **cfg);
bool readVarConfig(cfg_t **cfg); bool readVarConfig(cfg_t **cfg);
const char* CONFIG_FILE = "/etc/tellstick.conf"; const char* CONFIG_FILE = CONFIG_PATH "/tellstick.conf";
#ifdef __FreeBSD__ const char* VAR_CONFIG_FILE = VAR_CONFIG_PATH "/telldus-core.conf";
const char* VAR_CONFIG_FILE = "/var/spool/telldus-core.conf";
#else
const char* VAR_CONFIG_FILE = "/var/state/telldus-core.conf";
#endif
/* /*
* Constructor * Constructor