Fixed FilesystemPath::isFile return value. #491
Conversation
|
Thank you! LGTM. I'll just wait for TeamCity to finish all builds and then I will merge it. AppVeyor will probably fail as we have problems with timeouts in it right now but no worries. |
|
The AppVeyor build failure can be ignored as it timeouted (again...). We will have to do something with it. |
src/utils/filesystem_path.cpp
Outdated
| @@ -141,7 +141,11 @@ class FilesystemPathImplWindows : public FilesystemPathImpl | |||
|
|
|||
| virtual bool isFile() override | |||
| { | |||
| return !isDirectory(); | |||
| WIN32_FIND_DATA ffd; | |||
There was a problem hiding this comment.
Instead of FindFirstFile(), wouldn't it be easier and more straightforward to use just GetFileAttributes()?
virtual bool isFile() override
{
auto attrs = GetFileAttributes(_path.c_str());
return (attrs != INVALID_FILE_ATTRIBUTES &&
(attrs & FILE_ATTRIBUTE_DIRECTORY) == 0);
}I am not a Windows user, but GetFileAttributes() kind of more resembles the POSIX stat() function.
There was a problem hiding this comment.
I agree with @s3rvac that GetFileAttributes makes more sense here than FindFirstFile.
There was a problem hiding this comment.
I have implemented it as suggested and did a forced update. At first I thought that the above would incorrectly return true on INVALID_FILE_ATTRIBUTES since it is defined as -1. However, I see that the logical && and == causes it to indeed function properly.
astrelsky
force-pushed
the
Issue490
branch
2 times, most recently
from
8239679
to
ae163f3
Compare
Instances of reinterpret_cast<HANDLE>(-1) in FilesystemPathImplWindows have been replaced with INVALID_HANDLE_VALUE for readability. GetFileAttributes was utilized in place of FindFirstFile to check for file existance and file attributes.
|
Thank you for your contribution. I've merged your changes. |
Resolves #490
@metthal I went ahead and implemented your suggestions. I also split it into a separate branch and removed these changes from the other pull request as I should have done in the first place.
Regards,
Andrew Strelsky