Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1105 NLMISC::createDebug - Infinite loop

Browse source
This commit is contained in:
kervala 2010-09-26 23:08:17 +02:00
parent bbb68d1c08
commit 9ad0a25d50
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/nel/src/misc/path.cpp
View file

@ -2392,8 +2392,11 @@ bool CFile::setRWAccess(const std::string &filename)
{
// try to set the read/write access
if (_chmod (filename.c_str(), _S_IREAD | _S_IWRITE) == -1)
{
if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
{
nlwarning ("PATH: Can't set RW access to file '%s': %d %s", filename.c_str(), errno, strerror(errno));
}
return false;
}
}
@ -2403,15 +2406,22 @@ bool CFile::setRWAccess(const std::string &filename)
{
// try to set the read/write access
if (chmod (filename.c_str(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH) == -1)
{
if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
{
nlwarning ("PATH: Can't set RW access to file '%s': %d %s", filename.c_str(), errno, strerror(errno));
}
return false;
}
}
else
{
if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
{
nlwarning("PATH: Can't access to file '%s'", filename.c_str());
}
// return false;
}
#endif
return true;
}
@ -2426,8 +2436,11 @@ bool CFile::deleteFile(const std::string &filename)
setRWAccess(filename);
int res = unlink (filename.c_str());
if (res == -1)
{
if (INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
{
nlwarning ("PATH: Can't delete file '%s': (errno %d) %s", filename.c_str(), errno, strerror(errno));
}
return false;
}
return true;