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

Fix for bug in windows with backslash directory seperators in config path when used with <include> tag and a relative include path, reported by daurnimator

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@8387 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2007-10-27 14:32:24 +00:00
parent 66445ed7a2
commit fa6b96d825
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/configreader.cpp
View File

@ -1285,15 +1285,10 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
confpath = ServerInstance->ConfigFileName;
newfile = file;
for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++)
{
if (*c == '\\')
{
*c = '/';
}
}
std::replace(newfile.begin(),newfile.end(),'\\','/');
std::replace(confpath.begin(),confpath.end(),'\\','/');
if (file[0] != '/')
if (newfile[0] != '/')
{
if((pos = confpath.rfind("/")) != std::string::npos)
{
@ -1302,7 +1297,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
}
else
{
errorstream << "Couldn't get config path from: " << confpath << std::endl;
errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
return false;
}
}