From 7d9dc1a36b003cca9adc0acf556d57ac1b25a390 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 7 Feb 2014 13:23:26 +0100 Subject: [PATCH] Fix including a non-existing directory exception requires path information. Fixes #5618 --- lib/base/utility.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp index d8025d6d0..7070c918d 100644 --- a/lib/base/utility.cpp +++ b/lib/base/utility.cpp @@ -472,7 +472,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo if (dirp == NULL) BOOST_THROW_EXCEPTION(posix_error() << boost::errinfo_api_function("opendir") - << boost::errinfo_errno(errno)); + << boost::errinfo_errno(errno) + << boost::errinfo_file_name(path)); while (dirp) { dirent ent, *pent; @@ -482,7 +483,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo BOOST_THROW_EXCEPTION(posix_error() << boost::errinfo_api_function("readdir_r") - << boost::errinfo_errno(errno)); + << boost::errinfo_errno(errno) + << boost::errinfo_file_name(path)); } if (!pent) @@ -500,7 +502,8 @@ bool Utility::GlobRecursive(const String& path, const String& pattern, const boo BOOST_THROW_EXCEPTION(posix_error() << boost::errinfo_api_function("lstat") - << boost::errinfo_errno(errno)); + << boost::errinfo_errno(errno) + << boost::errinfo_file_name(cpath)); } 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::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))