Skip to content

<filesystem>: directory_entry(const path&, error_code&) should return error code #1343

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

Merged
StephanTLavavej merged 17 commits into from
Jun 19, 2022
Merged

<filesystem>: directory_entry(const path&, error_code&) should return error code #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c814ad9
fix error_code on directory_entry constructor
Arzaghi Oct 5, 2020
eee1397
fix similar issue in some other functions
Arzaghi Oct 5, 2020
02ad81c
add empty line
Arzaghi Oct 5, 2020
dca45f3
try trigger Azure pipeline
Arzaghi Oct 5, 2020
b44a978
clang format
Arzaghi Oct 5, 2020
ce2291c
Merge branch 'master' into gh1343
StephanTLavavej Oct 6, 2020
e3c3a39
Update test.cpp
Arzaghi Oct 6, 2020
b78a0d7
Follow the Standard in non-error_code methods
Arzaghi Dec 16, 2020
af7f57e
Modify some tests to match with the Standard expectations
Arzaghi Dec 16, 2020
4c23fcf
add an empty line
Arzaghi Dec 16, 2020
cb918a8
try to re-trigger the Azure pipeline
Arzaghi Dec 16, 2020
888d39b
Revert wrong modifications in tests
Arzaghi Dec 17, 2020
e95a83a
Modify refersh
Arzaghi Dec 18, 2020
f1f827e
refresh() and refresh(ec) should behave identically
Arzaghi Dec 19, 2020
af7aed3
Apply suggestions from code review
Arzaghi Jun 2, 2022
d0b55d4
Merge branch 'main' into Fix_Issue232
StephanTLavavej Jun 2, 2022
caafcb9
Test refresh() and refresh(ec).
StephanTLavavej Jun 4, 2022
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
24 changes: 15 additions & 9 deletions stl/inc/filesystem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2111,12 +2111,14 @@ namespace filesystem {
directory_entry(const directory_entry&) = default;
directory_entry(directory_entry&&) noexcept = default;
explicit directory_entry(const filesystem::path& _Path_arg) : _Cached_data{}, _Path(_Path_arg) {
(void) _Refresh(_Cached_data, _Path);
refresh();
}

directory_entry(const filesystem::path& _Path_arg, error_code& _Ec) : _Cached_data{}, _Path(_Path_arg) {
_Ec.clear();
(void) _Refresh(_Cached_data, _Path);
refresh(_Ec);
if (_Ec) {
_Path.clear();
}
}

~directory_entry() = default;
Expand All @@ -2128,35 +2130,39 @@ namespace filesystem {
// [fs.dir.entry.mods], modifiers
void assign(const filesystem::path& _Path_arg) {
_Path.assign(_Path_arg);
(void) _Refresh(_Cached_data, _Path);
refresh();
}

void assign(const filesystem::path& _Path_arg, error_code& _Ec) {
_Ec.clear(); // for exception safety
_Path.assign(_Path_arg);
(void) _Refresh(_Cached_data, _Path);
refresh(_Ec);
}

void replace_filename(const filesystem::path& _Path_arg) {
_Path.replace_filename(_Path_arg);
(void) _Refresh(_Cached_data, _Path);
refresh();
}

void replace_filename(const filesystem::path& _Path_arg, error_code& _Ec) {
_Ec.clear(); // for exception safety
_Path.replace_filename(_Path_arg);
(void) _Refresh(_Cached_data, _Path);
refresh(_Ec);
}

void refresh() {
const auto _Error = _Refresh(_Cached_data, _Path);
if (_Error != __std_win_error::_Success) {
if (_Error != __std_win_error::_Success && !__std_is_file_not_found(_Error)) {
_Throw_fs_error("directory_entry::refresh", _Error, _Path);
}
}

void refresh(error_code& _Ec) noexcept {
_Ec = _Make_ec(_Refresh(_Cached_data, _Path));
_Ec.clear();
const auto _Error = _Refresh(_Cached_data, _Path);
if (_Error != __std_win_error::_Success && !__std_is_file_not_found(_Error)) {
_Ec = _Make_ec(_Error);
}
}

#if _HAS_CXX20
Expand Down
6 changes: 5 additions & 1 deletion tests/std/tests/P0218R1_filesystem/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,11 @@ void test_directory_entry() {
EXPECT(!nonexistentEntryEc.exists());
EXPECT(good(ec));

EXPECT(throws_filesystem_error([&] { nonexistentEntryEc.refresh(); }, "directory_entry::refresh", nonexistent));
// Also test GH-232 "<filesystem>: directory_entry(const path& p, error_code& ec) does not return error code"
nonexistentEntry.refresh();

nonexistentEntryEc.refresh(ec);
EXPECT(good(ec));
}

directory_entry goodEntry(filePath, ec);
Expand Down