FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added check into the application usage list of command line args for

Browse Source 
unrecognized options to prevent unprocessed, but valid options being
classed as unrecognized.
This commit is contained in:
Robert Osfield
2003-02-19 11:32:15 +00:00
parent 0d3f78350a
commit 7c6cdcde1e
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/osg/ArgumentParser.cpp
View File

@@ -1,6 +1,8 @@
#include <osg/ArgumentParser>
#include <osg/ApplicationUsage>
#include <set>
using namespace osg;
ArgumentParser::ArgumentParser(int* argc,char **argv):
@@ -20,7 +22,10 @@ int ArgumentParser::find(const std::string& str) const
{
for(int pos=1;pos<*_argc;++pos)
{
if (str==_argv[pos]) return pos;
if (str==_argv[pos])
{
return pos;
}
}
return 0;
}
@@ -275,9 +280,33 @@ void ArgumentParser::reportError(const std::string& message,ErrorSeverity severi
void ArgumentParser::reportRemainingOptionsAsUnrecognized(ErrorSeverity severity)
{
std::set<std::string> options;
if (_usage)
{
// parse the usage options to get all the option that the application can potential handle.
for(ApplicationUsage::UsageMap::const_iterator itr=_usage->getCommandLineOptions().begin();
itr!=_usage->getCommandLineOptions().end();
++itr)
{
const std::string& option = itr->first;
unsigned int prevpos = 0, pos = 0;
while ((pos=option.find(' ',prevpos))!=std::string::npos)
{
if (option[prevpos]=='-') options.insert(std::string(option,prevpos,pos-prevpos));
prevpos=pos+1;
}
if (option[prevpos]=='-') options.insert(std::string(option,prevpos,std::string::npos));
}
}
for(int pos=1;pos<argc();++pos)
{
if (isOption(pos)) reportError(getProgramName() +": unrceognized option "+_argv[pos],severity);
// if an option and havn't been previous querried for report as unrecognized.
if (isOption(pos) && options.find(_argv[pos])==options.end())
{
reportError(getProgramName() +": unrceognized option "+_argv[pos],severity);
}
}
}
void ArgumentParser::writeErrorMessages(std::ostream& output,ErrorSeverity severity)