class Appl: changed command from required to not-required.

This commit is contained in:
Roland Jax
2014-11-24 18:19:10 +01:00
parent 972277d68d
commit 73eeef99f6
4 changed files with 31 additions and 35 deletions
+9 -17
View File
@@ -107,25 +107,17 @@ void Appl::parseArgs(int argc, char* argv[])
}
// check command
if (m_needCommand == true) {
for (int i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (_argv[i].rfind("-", 0) != string::npos) {
i++;
continue;
}
if (m_command.size() == 0)
m_command = _argv[i];
else
m_arguments.push_back(_argv[i]);
}
if (m_command.size() == 0) {
cerr << endl << "command needed" << endl;
printHelp();
if (_argv[i].rfind("-", 0) != string::npos) {
i++;
continue;
}
if (m_command.size() == 0)
m_command = _argv[i];
else
m_arguments.push_back(_argv[i]);
}
}
bool Appl::checkOption(const string& option, const string& value)
@@ -196,7 +188,7 @@ void Appl::printHelp()
cerr << endl << "Usage:" << endl << " "
<< m_argv[0].substr(m_argv[0].find_last_of("/\\") + 1) << " [OPTIONS...]" ;
if (m_needCommand == true)
if (m_withCommand == true)
if (m_withArgument == true)
cerr << " COMMAND {ARGS...}" << endl << endl;
else
+13 -8
View File
@@ -175,6 +175,12 @@ public:
* @return number of commands and arguments.
*/
int numArgs() const { return m_arguments.size(); }
/**
* @brief returns the string of an interested argument.
* @param num number of interested argument.
* @return the argument string.
*/
string getArg(const int num) const { return m_arguments[num]; }
/**
* @brief returns the string of given command.
@@ -183,11 +189,10 @@ public:
string getCommand() const { return m_command; }
/**
* @brief returns the string of an interested argument.
* @param num number of interested argument.
* @return the argument string.
* @brief returns the string of given command.
* @return the command string.
*/
string getArg(const int num) const { return m_arguments[num]; }
bool missingCommand() const { return (m_command.size() == 0 ? true : false); }
private:
/** private constructor - singleton pattern */
@@ -197,7 +202,7 @@ private:
* @param argument is true if command could have an argument.
*/
Appl(const bool command, const bool argument)
: m_needCommand(command), m_withArgument(argument) {}
: m_withCommand(command), m_withArgument(argument) {}
/**
* @brief private copy construtor.
@@ -229,10 +234,10 @@ private:
/** application version string */
const char* m_version;
/** true if the application need a command */
bool m_needCommand;
/** true if the application could have a command */
bool m_withCommand;
/** true if the needed command could have an argument */
/** true if the command could have an argument */
bool m_withArgument;
/** command (argument 0 = command) string */