nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG: in Appl::parseArgs: 'Checking if necessary arguments were entered' added.

Browse Source
This commit is contained in:
Roland Jax
2014-06-10 13:51:05 +02:00
parent 5ce18994d5
commit cb35117785
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/appl.cpp
+6 -2
View File
@@ -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;
lib/appl.h
+2 -2
View File
@@ -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;
src/baseloop.cpp
+14 -14
View File
@@ -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;