tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix including a non-existing directory exception requires path information.

Browse Source 
Fixes #5618
This commit is contained in:
Michael Friedrich 2014-02-07 13:23:26 +01:00
parent 11c42b1483
commit 7d9dc1a36b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/base/utility.cpp
View File

@ -472,7 +472,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
if (dirp == NULL) if (dirp == NULL)
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("opendir") << boost::errinfo_api_function("opendir")
<< boost::errinfo_errno(errno)); << boost::errinfo_errno(errno)
<< boost::errinfo_file_name(path));
while (dirp) { while (dirp) {
dirent ent, *pent; dirent ent, *pent;
@ -482,7 +483,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("readdir_r") << boost::errinfo_api_function("readdir_r")
<< boost::errinfo_errno(errno)); << boost::errinfo_errno(errno)
<< boost::errinfo_file_name(path));
} }
if (!pent) if (!pent)
@ -500,7 +502,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("lstat") << boost::errinfo_api_function("lstat")
<< boost::errinfo_errno(errno)); << boost::errinfo_errno(errno)
<< boost::errinfo_file_name(cpath));
} }
if (S_ISDIR(statbuf.st_mode)) if (S_ISDIR(statbuf.st_mode))
@ -511,7 +514,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo
BOOST_THROW_EXCEPTION(posix_error() BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("stat") << boost::errinfo_api_function("stat")
<< boost::errinfo_errno(errno)); << boost::errinfo_errno(errno)
<< boost::errinfo_file_name(cpath));
} }
if (!S_ISDIR(statbuf.st_mode) && !S_ISREG(statbuf.st_mode)) if (!S_ISDIR(statbuf.st_mode) && !S_ISREG(statbuf.st_mode))