Skip to content

Commit

Permalink
Correction of 6198
Browse files Browse the repository at this point in the history
  • Loading branch information
alabuzhev committed Oct 9, 2023
1 parent 17e0177 commit ff81237
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions far/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
drkns 2023-10-09 23:16:20+01:00 - build 6199

1. Correction of 6198.

--------------------------------------------------------------------------------
drkns 2023-10-09 17:17:17+01:00 - build 6198

Expand Down
6 changes: 3 additions & 3 deletions far/platform.fs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2241,14 +2241,14 @@ namespace os::fs
return true;
}

FindData = {};
FindData.Attributes = INVALID_FILE_ATTRIBUTES;

// The logic below was added in 596 to retrieve the data when we don't have access to one of the upper directories.
// It is better to explicitly limit it to that particular case to avoid any possible interference with legit lookup errors, e.g. when the dir is empty.
if (const auto ErrorState = last_error(); ErrorState.Win32Error != ERROR_ACCESS_DENIED)
return false;

FindData = {};
FindData.Attributes = INVALID_FILE_ATTRIBUTES;

size_t DirOffset = 0;
ParsePath(FileName, &DirOffset);
if (FileName.find_first_of(L"*?"sv, DirOffset) != string::npos)
Expand Down
2 changes: 1 addition & 1 deletion far/vbuild.m4
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6198
6199

0 comments on commit ff81237

Please sign in to comment.