ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-30 04:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow confpath to be a file name in the current directory

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11864 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
danieldg 2009-10-13 00:07:37 +00:00
parent 2602f4efbd
commit 382cac82df
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/configreader.cpp
View File

@ -1673,16 +1673,12 @@ bool ServerConfig::DoInclude(const std::string &file, bool allowexeinc)
if ((newfile[0] != '/') && (!StartsWithWindowsDriveLetter(newfile))) if ((newfile[0] != '/') && (!StartsWithWindowsDriveLetter(newfile)))
{ {
if((pos = confpath.rfind("/")) != std::string::npos) pos = confpath.rfind("/")
if(pos != std::string::npos)
{ {
/* Leaves us with just the path */ /* Leaves us with just the path */
newfile = confpath.substr(0, pos) + std::string("/") + newfile; newfile = confpath.substr(0, pos) + std::string("/") + newfile;
} }
else
{
errstr << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
return false;
}
} }
FILE* conf = fopen(newfile.c_str(), "r"); FILE* conf = fopen(newfile.c_str(), "r");