From cb3511778586583bb541bd69b4e048faa8fb8568 Mon Sep 17 00:00:00 2001
From: Roland Jax <roland.jax@liwest.at>
Date: Tue, 10 Jun 2014 13:51:05 +0200
Subject: [PATCH] BUG: in Appl::parseArgs: 'Checking if necessary arguments
 were entered' added.

---
 lib/appl.cpp     |  8 ++++++--
 lib/appl.h       |  4 ++--
 src/baseloop.cpp | 28 ++++++++++++++--------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/appl.cpp b/lib/appl.cpp
index 2058d6b3..20ce04e1 100644
--- a/lib/appl.cpp
+++ b/lib/appl.cpp
@@ -86,7 +86,7 @@ bool Appl::parseArgs(int argc, char* argv[])
 	m_argc = argc;
 	m_argv = _argv;
 
-	for (int i = 1; i < m_argc; i++) {
+	for (size_t i = 1; i < m_argc; i++) {
 
 		// find option with long format '--'
 		if (m_argv[i].rfind("--") == 0 && m_argv[i].size() > 2) {
@@ -124,13 +124,17 @@ bool Appl::parseArgs(int argc, char* argv[])
 		if (m_argc < (m_argNum + 1))
 			return false;
 
-		for (int i = 1; i < m_argc; i++) {
+		for (size_t i = 1; i < m_argc; i++) {
+
 			if (m_argv[i].rfind("-", 0) != std::string::npos) {
 				i++;
 				continue;
 			}
 			m_argValues.push_back(m_argv[i]);
 		}
+
+		if (m_argValues.size() < m_argNum)
+			return false;
 	}
 
 	return true;
diff --git a/lib/appl.h b/lib/appl.h
index 2641848a..ae040b91 100644
--- a/lib/appl.h
+++ b/lib/appl.h
@@ -88,7 +88,7 @@ private:
 		Optiontype optiontype;
 	};
 
-	int m_argc;
+	size_t m_argc;
 	std::vector<std::string> m_argv;
 
 	std::vector<Arg> m_args;
@@ -98,7 +98,7 @@ private:
 	std::map<const char*, Param>::iterator p_it;
 
 	std::string m_argTxt;
-	int m_argNum;
+	size_t m_argNum;
 
 	std::vector<std::string> m_argValues;
 
diff --git a/src/baseloop.cpp b/src/baseloop.cpp
index 3f6c8360..9fcafb31 100644
--- a/src/baseloop.cpp
+++ b/src/baseloop.cpp
@@ -78,7 +78,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case get:
 		if (cmd.size() < 3 || cmd.size() > 4) {
-			result << "format: [get class cmd (sub)]";
+			result << "usage: 'get class cmd (sub)'";
 			break;
 		}
 
@@ -120,7 +120,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case set:
 		if (cmd.size() != 4) {
-			result << "format: [set class cmd value]";
+			result << "usage: 'set class cmd value'";
 			break;
 		}
 
@@ -173,7 +173,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case cyc:
 		if (cmd.size() < 3 || cmd.size() > 4) {
-			result << "format: [cyc class cmd (sub)]";
+			result << "usage: 'cyc class cmd (sub)'";
 			break;
 		}
 
@@ -201,7 +201,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case hex:
 		if (cmd.size() != 3) {
-			result << "format: [hex type value] (ZZ PB SB NN Dx)";
+			result << "usage: 'hex type value' (value: ZZPBSBNNDx)";
 			break;
 		}
 
@@ -234,7 +234,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case dump:
 		if (cmd.size() != 2) {
-			result << "format: [dump state] (on|off)";
+			result << "usage: 'dump state' (state: on|off)";
 			break;
 		}
 
@@ -245,7 +245,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case logarea:
 		if (cmd.size() != 2) {
-			result << "format: [logarea area,area,..] (bas|net|bus|cyc|all)";
+			result << "usage: 'logarea area,area,..' (area: bas|net|bus|cyc|all)";
 			break;
 		}
 
@@ -255,7 +255,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case loglevel:
 		if (cmd.size() != 2) {
-			result << "format: [loglevel level] (error|event|trace|debug)";
+			result << "usage: 'loglevel level' (level: error|event|trace|debug)";
 			break;
 		}
 
@@ -265,13 +265,13 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 	case help:
 		result << "commands:" << std::endl
-		       << " get       - fetch ebus data       [get class cmd (sub)]" << std::endl
-		       << " set       - set ebus values       [set class cmd value]" << std::endl
-		       << " cyc       - fetch cycle data      [cyc class cmd (sub)]" << std::endl
-		       << " hex       - send given hex value  [hex type value] (ZZ PB SB NN Dx)" << std::endl
-		       << " dump      - change dump state     [dump state] (on|off)" << std::endl
-		       << " logarea   - change log area       [logarea area,area,..] (bas|net|bus|cyc|all)" << std::endl
-		       << " loglevel  - change log level      [loglevel level] (error|event|trace|debug)" << std::endl
+		       << " get       - fetch ebus data       'get class cmd (sub)'" << std::endl
+		       << " set       - set ebus values       'set class cmd value'" << std::endl
+		       << " cyc       - fetch cycle data      'cyc class cmd (sub)'" << std::endl
+		       << " hex       - send given hex value  'hex type value' (value: ZZPBSBNNDx)" << std::endl
+		       << " dump      - change dump state     'dump state' (state: on|off)" << std::endl
+		       << " logarea   - change log area       'logarea area,area,..' (area: bas|net|bus|cyc|all)" << std::endl
+		       << " loglevel  - change log level      'loglevel level' (level: error|event|trace|debug)" << std::endl
 		       << " quit      - close connection" << std::endl
 		       << " help      - print this page";
 		break;