Skip to content

Fallback to file_directory_information_format for directory iterator #267

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
wants to merge 1 commit into from
Closed

Fallback to file_directory_information_format for directory iterator #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/directory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,13 @@ error_code dir_itr_create(boost::intrusive_ptr< detail::dir_itr_imp >& imp, fs::
{
DWORD error = ::GetLastError();

if (error == ERROR_NOT_SUPPORTED || error == ERROR_INVALID_PARAMETER)
{
// Fall back to file_directory_information_format
filesystem::detail::atomic_store_relaxed(g_extra_data_format, file_directory_information_format);
return dir_itr_create(imp, dir, opts, params, first_filename, sf, symlink_sf);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Attempt to goto into last branch as fallback failed, most probably extra_data / dir_itr_extra_size already has some incorrect data here, have not looked deep.

}

if (error == ERROR_NO_MORE_FILES || error == ERROR_FILE_NOT_FOUND)
goto done;

Expand Down