boost/filesystem
2
0
Fork 0
mirror of https://github.com/boostorg/filesystem.git synced 2026-02-23 03:32:18 +00:00
Code Issues Projects Releases Wiki Activity

is_empty()overload with error_code parameter should not throw on error. Thanks to ldqrk for pull request #42

Browse Source
This commit is contained in:
Beman
2017-04-03 09:36:43 -04:00
parent 9144a8ebd7
commit 7fd4214912
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/operations.cpp
View File

@@ -329,9 +329,10 @@ namespace
// general helpers -----------------------------------------------------------------//
bool is_empty_directory(const path& p)
bool is_empty_directory(const path& p, error_code* ec)
{
return fs::directory_iterator(p)== end_dir_itr;
return (ec != 0 ? fs::directory_iterator(p, *ec) : fs::directory_iterator(p))
== end_dir_itr;
}
bool not_found_error(int errval); // forward declaration
@@ -1408,7 +1409,7 @@ namespace detail
p, ec, "boost::filesystem::is_empty"))
return false;
return S_ISDIR(path_stat.st_mode)
? is_empty_directory(p)
? is_empty_directory(p, ec)
: path_stat.st_size == 0;
# else
@@ -1420,7 +1421,7 @@ namespace detail
if (ec != 0) ec->clear();
return
(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
? is_empty_directory(p)
? is_empty_directory(p, ec)
: (!fad.nFileSizeHigh && !fad.nFileSizeLow);
# endif
}