adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-08 01:43:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try multiple locations to find modules

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@71 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-04-03 05:40:46 +00:00
parent 263295a1ae
commit 8b1a745081
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules.cpp
+24 -4
View File
@@ -477,7 +477,7 @@ CModule* CModules::FindModule(const string& sModule) {
return NULL;
}
bool CModules::LoadModule(const string& sModule, const string& sArgs, CUser* pUser, const string& sPath, string& sRetMsg) {
bool CModules::LoadModule(const string& sModule, const string& sArgs, CUser* pUser, string& sRetMsg) {
sRetMsg = "";
if (!pUser) {
@@ -497,7 +497,27 @@ bool CModules::LoadModule(const string& sModule, const string& sArgs, CUser* pUs
return false;
}
void* p = dlopen((pUser->GetModPath() + "/" + sModule + ".so").c_str(), RTLD_LAZY);
string sModPath = pUser->GetModPath();
if (!CFile::Exists(sModPath + "/" + sModule + ".so")) {
DEBUG_ONLY(cout << "[" << sModPath << "/" << sModule << ".so] Not found..." << endl);
sModPath = _MODDIR_;
if (!CFile::Exists(sModPath + "/" + sModule + ".so"))
{
DEBUG_ONLY(cout << "[" << sModPath << "/" << sModule << ".so] Not found..." << endl);
sModPath = pUser->GetBinPath() + "/modules";
if (!CFile::Exists(sModPath + "/" + sModule + ".so"))
{
DEBUG_ONLY(cout << "[" << sModPath << "/" << sModule << ".so] Not found... giving up!" << endl);
sRetMsg = "Unable to load module [" + sModule + "] No such module.";
return false;
}
}
}
void* p = dlopen((sModPath + "/" + sModule + ".so").c_str(), RTLD_LAZY);
if (!p) {
sRetMsg = "Unable to load module [" + sModule + "] [" + dlerror() + "]";
@@ -579,13 +599,13 @@ bool CModules::UnloadModule(const string& sModule, string& sRetMsg) {
return false;
}
bool CModules::ReloadModule(const string& sModule, const string& sArgs, CUser* pUser, const string& sPath, string& sRetMsg) {
bool CModules::ReloadModule(const string& sModule, const string& sArgs, CUser* pUser, string& sRetMsg) {
sRetMsg = "";
if (!UnloadModule(sModule, sRetMsg)) {
return false;
}
if (!LoadModule(sModule, sArgs, pUser, sPath, sRetMsg)) {
if (!LoadModule(sModule, sArgs, pUser, sRetMsg)) {
return false;
}