diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-03-17 11:28:50 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-03-17 11:28:50 +0100 |
| commit | 95d70559d649de94502179a22856b58dbb9d47c2 (patch) | |
| tree | 2a592d606971c8c2269389f6831f8dbb2bac9918 /lib/MiddleWare/PluginManager.cpp | |
| parent | 8c68c3576464947a43ada0d02cfb3313cb7ec697 (diff) | |
| parent | 770a494819fa5c44b14ca013c4b433d278b2a75a (diff) | |
| download | abrt-95d70559d649de94502179a22856b58dbb9d47c2.tar.gz abrt-95d70559d649de94502179a22856b58dbb9d47c2.tar.xz abrt-95d70559d649de94502179a22856b58dbb9d47c2.zip | |
Merge branch 'master' of git://git.fedorahosted.org/git/crash-catcher
Diffstat (limited to 'lib/MiddleWare/PluginManager.cpp')
| -rw-r--r-- | lib/MiddleWare/PluginManager.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/MiddleWare/PluginManager.cpp b/lib/MiddleWare/PluginManager.cpp index 7d8eb4e..e0def74 100644 --- a/lib/MiddleWare/PluginManager.cpp +++ b/lib/MiddleWare/PluginManager.cpp @@ -37,7 +37,7 @@ CPluginManager::~CPluginManager() void CPluginManager::LoadPlugins() { - DIR *dir = opendir(m_sPlugisConfDir.c_str()); + DIR *dir = opendir(m_sPlugisLibDir.c_str()); struct dirent *dent = NULL; if (dir != NULL) { @@ -46,10 +46,11 @@ void CPluginManager::LoadPlugins() if (dent->d_type == DT_REG) { std::string name = dent->d_name; - std::string extension = name.substr(name.length()-sizeof(PLUGINS_CONF_EXTENSION)+1); - if (extension == PLUGINS_CONF_EXTENSION) + std::string extension = name.substr(name.length()-sizeof(PLUGINS_LIB_EXTENSION)+1); + if (extension == PLUGINS_LIB_EXTENSION) { - name.erase(name.length()-sizeof(PLUGINS_CONF_EXTENSION)); + name.erase(0, sizeof(PLUGINS_LIB_PREFIX) - 1); + name.erase(name.length() - sizeof(PLUGINS_LIB_EXTENSION)); LoadPlugin(name); } } @@ -75,7 +76,7 @@ void CPluginManager::LoadPlugin(const std::string& pName) CABRTPlugin* abrtPlugin = NULL; try { - std::string libPath = m_sPlugisLibDir + "/lib" + pName + "." + PLUGINS_LIB_EXTENSIONS; + std::string libPath = m_sPlugisLibDir + "/" + PLUGINS_LIB_PREFIX + pName + "." + PLUGINS_LIB_EXTENSION; abrtPlugin = new CABRTPlugin(libPath); if (abrtPlugin->GetMagicNumber() != PLUGINS_MAGIC_NUMBER || (abrtPlugin->GetType() < LANGUAGE && abrtPlugin->GetType() > DATABASE)) |