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

Fixed telldus-core segfault because of config file path not set in correct order

Browse source
This commit is contained in:
Stefan Persson 2013-09-12 11:54:16 +02:00
parent c92ede9524
commit 194ca57295
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
telldus-core/service/CMakeLists.txt
View file

@ -94,6 +94,14 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
IF (UNIX AND NOT APPLE) IF (UNIX AND NOT APPLE)
SET(SCRIPT_PATH "/usr/local/share/telldus/scripts" CACHE PATH "The paths for scripts to execute on sensor events") SET(SCRIPT_PATH "/usr/local/share/telldus/scripts" CACHE PATH "The paths for scripts to execute on sensor events")
SET(SYSCONF_INSTALL_DIR "/etc" CACHE PATH "The sysconfig install dir (default prefix/etc)" )
IF (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
SET(DEFAULT_STATE_INSTALL_DIR "/var/spool")
ELSE ()
SET(DEFAULT_STATE_INSTALL_DIR "/var/state")
ENDIF ()
SET(STATE_INSTALL_DIR "${DEFAULT_STATE_INSTALL_DIR}" CACHE PATH "The directory to store state information of the devices")
ENDIF() ENDIF()
######## Platforms-specific, non configurable ######## ######## Platforms-specific, non configurable ########
@ -247,15 +255,6 @@ ENDIF (UNIX)
IF (UNIX AND NOT APPLE) IF (UNIX AND NOT APPLE)
INSTALL(TARGETS ${telldus-service_TARGET} RUNTIME DESTINATION sbin) INSTALL(TARGETS ${telldus-service_TARGET} RUNTIME DESTINATION sbin)
SET(SYSCONF_INSTALL_DIR "/etc" CACHE PATH "The sysconfig install dir (default prefix/etc)" )
IF (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
SET(DEFAULT_STATE_INSTALL_DIR "/var/spool")
ELSE ()
SET(DEFAULT_STATE_INSTALL_DIR "/var/state")
ENDIF ()
SET(STATE_INSTALL_DIR "${DEFAULT_STATE_INSTALL_DIR}" CACHE PATH "The directory to store state information of the devices")
INSTALL(FILES tellstick.conf INSTALL(FILES tellstick.conf
DESTINATION ${SYSCONF_INSTALL_DIR} DESTINATION ${SYSCONF_INSTALL_DIR}
) )

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

@ -13,6 +13,7 @@
#include "service/config.h" #include "service/config.h"
#include "client/telldus-core.h" #include "client/telldus-core.h"
#include "common/Strings.h" #include "common/Strings.h"
#include "service/Log.h"
class Settings::PrivateData { class Settings::PrivateData {
public: public:
@ -405,12 +406,14 @@ bool readConfig(cfg_t **cfg) {
FILE *fp = fopen(CONFIG_FILE, "re"); // e for setting O_CLOEXEC on the file handle FILE *fp = fopen(CONFIG_FILE, "re"); // e for setting O_CLOEXEC on the file handle
if (!fp) { if (!fp) {
Log::warning("Unable to open config file, %s", CONFIG_FILE);
return false; return false;
} }
(*cfg) = cfg_init(opts, CFGF_NOCASE); (*cfg) = cfg_init(opts, CFGF_NOCASE);
if (cfg_parse_fp((*cfg), fp) == CFG_PARSE_ERROR) { if (cfg_parse_fp((*cfg), fp) == CFG_PARSE_ERROR) {
(*cfg) = 0; (*cfg) = 0;
fclose(fp); fclose(fp);
Log::warning("Unable to parse config file, %s", CONFIG_FILE);
return false; return false;
} }
@ -432,12 +435,14 @@ bool readVarConfig(cfg_t **cfg) {
FILE *fp = fopen(VAR_CONFIG_FILE, "re"); // e for setting O_CLOEXEC on the file handle FILE *fp = fopen(VAR_CONFIG_FILE, "re"); // e for setting O_CLOEXEC on the file handle
if (!fp) { if (!fp) {
Log::warning("Unable to open var config file, %s", VAR_CONFIG_FILE);
return false; return false;
} }
(*cfg) = cfg_init(opts, CFGF_NOCASE); (*cfg) = cfg_init(opts, CFGF_NOCASE);
if (cfg_parse_fp((*cfg), fp) == CFG_PARSE_ERROR) { if (cfg_parse_fp((*cfg), fp) == CFG_PARSE_ERROR) {
(*cfg) = 0; (*cfg) = 0;
fclose(fp); fclose(fp);
Log::warning("Unable to parse var config file, %s", VAR_CONFIG_FILE);
return false; return false;
} }