Skip to content
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

Jump to bottom

Adjusted behavior of filesystem::is_empty and filesystem::directory_iterator to work with empty volumes #4311

Merged
merged 7 commits into from
Jan 17, 2024
Merged

Adjusted behavior of filesystem::is_empty and filesystem::directory_iterator to work with empty volumes #4311

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0289c7
Adjusted _Open_dir to fix behavior of filesystem::is_empty and filesy…
MartinKuschnik Jan 12, 2024
a4b0a2f
adjusted format
MartinKuschnik Jan 12, 2024
b388fa9
Merge branch 'microsoft:main' into fs__is_empty__and__directory_itera…
MartinKuschnik Jan 12, 2024
eda53fa
fixed unit tests
MartinKuschnik Jan 12, 2024
87f3ebe
Merge branch 'fs__is_empty__and__directory_iterator__with__volume_nam…
MartinKuschnik Jan 12, 2024
bb05e75
adjusted format
MartinKuschnik Jan 12, 2024
423e27a
Code review feedback.
StephanTLavavej Jan 17, 2024
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
10 changes: 10 additions & 0 deletions stl/inc/filesystem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2505,6 +2505,8 @@ namespace filesystem {
_EXPORT_STD enum class directory_options { none = 0, follow_directory_symlink = 1, skip_permission_denied = 2 };
_BITMASK_OPS(_EXPORT_STD, directory_options)

_EXPORT_STD _NODISCARD inline bool exists(const path& _Target, error_code& _Ec) noexcept;

struct _Dir_enum_impl {
_NODISCARD static __std_win_error _Advance_and_reset_if_no_more_files(shared_ptr<_Dir_enum_impl>& _Ptr) {
auto& _Impl = *_Ptr;
Expand Down Expand Up @@ -2543,6 +2545,7 @@ namespace filesystem {
return __std_win_error::_File_not_found;
}

const path _Original_path = _Path;
_Path /= L"*"sv;
auto _Error = _Dir._Open(_Path.c_str(), &_Data);
if (_Error == __std_win_error::_Success) {
Expand All @@ -2552,6 +2555,13 @@ namespace filesystem {
if (_Error == __std_win_error::_Access_denied
&& _Bitmask_includes_any(_Options_arg, directory_options::skip_permission_denied)) {
_Error = __std_win_error::_No_more_files;
} else if (_Error == __std_win_error::_File_not_found) {
error_code _Ignored; // When exists() returns true, that implies that the error_code is successful.
// When exists() returns false, we don't want to interfere with _Open_dir()'s behavior,
// as it's going to return __std_win_error::_File_not_found.
if (_STD filesystem::exists(_Original_path, _Ignored)) {
_Error = __std_win_error::_No_more_files; // Handle empty volumes, see GH-4291
}
}

return _Error;
Expand Down