generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 09:12:28 +02:00
Code Issues Projects Releases Wiki Activity

GH #48: Need getArgs() accessor

Browse Source 
GH #48: Need getArgs() accessor to Util::Application to retrieve
start-up arguments
This commit is contained in:
aleks-f
2013-01-05 15:54:12 -06:00
parent 73a3a5e288
commit 7e8797fb5a
4 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Util/src/Application.cpp
View File

@@ -167,7 +167,7 @@ void Application::init(int argc, wchar_t* argv[])
#endif
void Application::init(const std::vector<std::string>& args)
void Application::init(const ArgVec& args)
{
setArgs(args);
init();
@@ -316,7 +316,7 @@ int Application::run()
{
initialize(*this);
rc = EXIT_SOFTWARE;
rc = main(_args);
rc = main(_unprocessedArgs);
uninitialize();
}
catch (Poco::Exception& exc)
@@ -335,7 +335,7 @@ int Application::run()
}
int Application::main(const std::vector<std::string>& args)
int Application::main(const ArgVec& args)
{
return EXIT_OK;
}
@@ -345,24 +345,24 @@ void Application::setArgs(int argc, char* argv[])
{
_command = argv[0];
_pConfig->setInt("application.argc", argc);
_args.reserve(argc);
_unprocessedArgs.reserve(argc);
std::string argvKey = "application.argv[";
for (int i = 0; i < argc; ++i)
{
std::string arg(argv[i]);
_pConfig->setString(argvKey + NumberFormatter::format(i) + "]", arg);
_args.push_back(arg);
_unprocessedArgs.push_back(arg);
}
}
void Application::setArgs(const std::vector<std::string>& args)
void Application::setArgs(const ArgVec& args)
{
poco_assert (!args.empty());
_command = args[0];
_pConfig->setInt("application.argc", (int) args.size());
_args = args;
_unprocessedArgs = args;
std::string argvKey = "application.argv[";
for (int i = 0; i < args.size(); ++i)
{
@@ -376,9 +376,10 @@ void Application::processOptions()
defineOptions(_options);
OptionProcessor processor(_options);
processor.setUnixStyle(_unixOptions);
_args.erase(_args.begin());
ArgVec::iterator it = _args.begin();
while (it != _args.end() && !_stopOptionsProcessing)
_argv = _unprocessedArgs;
_unprocessedArgs.erase(_unprocessedArgs.begin());
ArgVec::iterator it = _unprocessedArgs.begin();
while (it != _unprocessedArgs.end() && !_stopOptionsProcessing)
{
std::string name;
std::string value;
@@ -388,7 +389,7 @@ void Application::processOptions()
{
handleOption(name, value);
}
it = _args.erase(it);
it = _unprocessedArgs.erase(it);
}
else ++it;
}