From 830a1bd130f819adfef71c882a335e5405f3f02d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 5 Mar 2015 09:43:51 +0100 Subject: fs/File{System,Info}: fix regular file check Don't use FILE_ATTRIBUTE_NORMAL, it's a "magic" value for something else. To check if a file is a regular file, we need to check if it's NOT a directory (or a device). --- src/fs/FileInfo.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/fs/FileInfo.hxx') diff --git a/src/fs/FileInfo.hxx b/src/fs/FileInfo.hxx index ad0fb4064..7b272568f 100644 --- a/src/fs/FileInfo.hxx +++ b/src/fs/FileInfo.hxx @@ -65,7 +65,8 @@ class FileInfo { public: bool IsRegular() const { #ifdef WIN32 - return data.dwFileAttributes & FILE_ATTRIBUTE_NORMAL; + return (data.dwFileAttributes & + (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE)) == 0; #else return S_ISREG(st.st_mode); #endif -- cgit v1.2.3