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).

fs/File{System,Info}: fix regular file check
830a1bd1 · Max Kellermann · 5c5ea8a2 · 830a1bd1 · 830a1bd1
Commit 830a1bd1 authored Mar 05, 2015 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

FileInfo.hxx src/fs/FileInfo.hxx +2 -1

FileSystem.hxx src/fs/FileSystem.hxx +2 -1

No files found.
--- 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

--- a/src/fs/FileSystem.hxx
+++ b/src/fs/FileSystem.hxx
@@ -152,7 +152,8 @@ FileExists(Path path, bool follow_symlinks = true)
 	(void)follow_symlinks;

 	const auto a = GetFileAttributes(path.c_str());
-	return a != INVALID_FILE_ATTRIBUTES && (a & FILE_ATTRIBUTE_NORMAL);
+	return a != INVALID_FILE_ATTRIBUTES &&
+		(a & (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE)) == 0;
 #else
 	struct stat buf;
 	return StatFile(path, buf, follow_symlinks) && S_ISREG(buf.st_mode);