From 5eb5894b1e96faa283b87961cd4c6d9e9d82fd39 Mon Sep 17 00:00:00 2001
From: Roland Jax <roland.jax@liwest.at>
Date: Wed, 17 Dec 2014 15:08:14 +0100
Subject: [PATCH] checkconfig....

---
 src/ebusd/baseloop.cpp |  6 ++++++
 src/ebusd/ebusd.cpp    | 12 ++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp
index e75ae818..115ac122 100644
--- a/src/ebusd/baseloop.cpp
+++ b/src/ebusd/baseloop.cpp
@@ -36,6 +36,12 @@ BaseLoop::BaseLoop()
 	m_messages = new MessageMap();
 	loadMessages();
 
+	// exit if checkconfig is true
+	if (A.getOptVal<bool>("checkconfig") == true) {
+		m_port = NULL;
+		return;
+	}
+
 	m_ownAddress = A.getOptVal<int>("address") & 0xff;
 	const bool answer = A.getOptVal<bool>("answer");
 
diff --git a/src/ebusd/ebusd.cpp b/src/ebusd/ebusd.cpp
index a6014e84..8a72f18e 100644
--- a/src/ebusd/ebusd.cpp
+++ b/src/ebusd/ebusd.cpp
@@ -160,13 +160,8 @@ int main(int argc, char* argv[])
 	// parse arguments
 	A.parseArgs(argc, argv);
 
-	// check of configuration files
-	if (A.getOptVal<bool>("checkconfig") == true) {
-		// TODO checkconfig(...);
-	}
-
-	// make me daemon
-	if (A.getOptVal<bool>("foreground") == true) {
+	// make me daemon or checkconfig is true
+	if (A.getOptVal<bool>("foreground") == true || A.getOptVal<bool>("checkconfig") == true) {
 		L += new LogConsole(calcAreaMask(A.getOptVal<const char*>("logareas")),
 				    calcLevel(A.getOptVal<const char*>("loglevel")),
 				    "logconsole");
@@ -190,7 +185,8 @@ int main(int argc, char* argv[])
 
 	// create baseloop
 	baseloop = new BaseLoop();
-	baseloop->start();
+	if (A.getOptVal<bool>("checkconfig") == false)
+		baseloop->start();
 
 	// shutdown
 	shutdown();