Skip to content

Fix remove_all(path, ec) to not throw filesystem_error via ++itr #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
b-spencer wants to merge 2 commits into from
Closed

Fix remove_all(path, ec) to not throw filesystem_error via ++itr #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1303b3e
Fix remove_all(path, ec) to not throw filesystem_error via ++itr
b-spencer Sep 13, 2017
aa2a58a
Fix dereference of ec pointer in directory_iterator_constructor
b-spencer Oct 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/operations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,14 +395,26 @@ namespace
}
else
itr = fs::directory_iterator(p);
for (; itr != end_dir_itr; ++itr)
while (itr != end_dir_itr)
{
fs::file_type tmp_type = query_file_type(itr->path(), ec);
if (ec != 0 && *ec)
return count;
count += remove_all_aux(itr->path(), tmp_type, ec);
if (ec != 0 && *ec)
return count;

// Don't let ++itr throw when reporting errors via ec.
if (ec != 0)
{
itr.increment(*ec);
if (*ec)
return count;
}
else
{
++itr;
}
}
}
remove_file_or_directory(p, type, ec);
Expand Down Expand Up @@ -2394,7 +2406,7 @@ namespace detail
&& (filename.size()== 1
|| (filename[1] == dot
&& filename.size()== 2)))
{ it.increment(*ec); }
{ ec ? it.increment(*ec) : ++it; }
}
}

Expand Down