generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-02 17:50:53 +02:00
Code Issues Projects Releases Wiki Activity

fixed SF# 2765569: LoadConfiguration failing from current directory

Browse Source
This commit is contained in:
Guenter Obiltschnig 2009-04-21 06:43:48 +00:00
parent 20200eaca8
commit 28461b8e1b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Util/src/Application.cpp
View File

@ -1,7 +1,7 @@
// //
// Application.cpp // Application.cpp
// //
// $Id: //poco/Main/Util/src/Application.cpp#30 $ // $Id: //poco/Main/Util/src/Application.cpp#31 $
// //
// Library: Util // Library: Util
// Package: Application // Package: Application
@ -250,16 +250,20 @@ int Application::loadConfiguration(int priority)
_pConfig->add(new PropertyFileConfiguration(cfgPath.toString()), priority, false, false); _pConfig->add(new PropertyFileConfiguration(cfgPath.toString()), priority, false, false);
++n; ++n;
} }
#ifndef POCO_UTIL_NO_INIFILECONFIGURATION
if (findAppConfigFile(appPath.getBaseName(), "ini", cfgPath)) if (findAppConfigFile(appPath.getBaseName(), "ini", cfgPath))
{ {
_pConfig->add(new IniFileConfiguration(cfgPath.toString()), priority, false, false); _pConfig->add(new IniFileConfiguration(cfgPath.toString()), priority, false, false);
++n; ++n;
} }
#endif
#ifndef POCO_UTIL_NO_XMLCONFIGURATION
if (findAppConfigFile(appPath.getBaseName(), "xml", cfgPath)) if (findAppConfigFile(appPath.getBaseName(), "xml", cfgPath))
{ {
_pConfig->add(new XMLConfiguration(cfgPath.toString()), priority, false, false); _pConfig->add(new XMLConfiguration(cfgPath.toString()), priority, false, false);
++n; ++n;
} }
#endif
if (n > 0) if (n > 0)
{ {
_pConfig->setString("application.configDir", cfgPath.parent().toString()); _pConfig->setString("application.configDir", cfgPath.parent().toString());
@ -274,10 +278,14 @@ void Application::loadConfiguration(const std::string& path, int priority)
std::string ext = confPath.getExtension(); std::string ext = confPath.getExtension();
if (icompare(ext, "properties") == 0) if (icompare(ext, "properties") == 0)
_pConfig->add(new PropertyFileConfiguration(confPath.toString()), priority, false, false); _pConfig->add(new PropertyFileConfiguration(confPath.toString()), priority, false, false);
#ifndef POCO_UTIL_NO_INIFILECONFIGURATION
else if (icompare(ext, "ini") == 0) else if (icompare(ext, "ini") == 0)
_pConfig->add(new IniFileConfiguration(confPath.toString()), priority, false, false); _pConfig->add(new IniFileConfiguration(confPath.toString()), priority, false, false);
#endif
#ifndef POCO_UTIL_NO_XMLCONFIGURATION
else if (icompare(ext, "xml") == 0) else if (icompare(ext, "xml") == 0)
_pConfig->add(new XMLConfiguration(confPath.toString()), priority, false, false); _pConfig->add(new XMLConfiguration(confPath.toString()), priority, false, false);
#endif
else else
throw Poco::InvalidArgumentException("Unsupported configuration file type", ext); throw Poco::InvalidArgumentException("Unsupported configuration file type", ext);
} }
@ -399,6 +407,7 @@ void Application::getApplicationPath(Poco::Path& appPath) const
{ {
if (!Path::find(Environment::get("PATH"), _command, appPath)) if (!Path::find(Environment::get("PATH"), _command, appPath))
appPath = Path(Path::current(), _command); appPath = Path(Path::current(), _command);
appPath.makeAbsolute();
} }
#elif defined(POCO_OS_FAMILY_WINDOWS) #elif defined(POCO_OS_FAMILY_WINDOWS)
#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING) #if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
@ -432,7 +441,7 @@ bool Application::findFile(Poco::Path& path) const
Path appPath; Path appPath;
getApplicationPath(appPath); getApplicationPath(appPath);
Path base = appPath.parent(); Path base = appPath.parent();
while (base.depth() > 0) do
{ {
Path p(base, path); Path p(base, path);
File f(p); File f(p);
@ -441,8 +450,9 @@ bool Application::findFile(Poco::Path& path) const
path = p; path = p;
return true; return true;
} }
base.popDirectory(); if (base.depth() > 0) base.popDirectory();
} }
while (base.depth() > 0);
return false; return false;
} }

BIN
bin/PocoMsg.dll
View File

Binary file not shown.