From 6b3b1cbd995ec2313427a6fe0b1607938cc71794 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 27 Feb 2015 19:08:04 +0100 Subject: fs/FileSystem: use GetFileAttributes() on WIN32 if possible --- src/fs/FileSystem.hxx | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/fs/FileSystem.hxx b/src/fs/FileSystem.hxx index 6f19c8ed3..c0c77129c 100644 --- a/src/fs/FileSystem.hxx +++ b/src/fs/FileSystem.hxx @@ -26,10 +26,15 @@ #include "Path.hxx" +#ifdef WIN32 +#include +#endif + #include #include #include + class AllocatedPath; namespace FOpenMode { @@ -128,8 +133,15 @@ CheckAccess(Path path, int mode) static inline bool FileExists(Path path, bool follow_symlinks = true) { +#ifdef WIN32 + (void)follow_symlinks; + + const auto a = GetFileAttributes(path.c_str()); + return a != INVALID_FILE_ATTRIBUTES && (a & FILE_ATTRIBUTE_NORMAL); +#else struct stat buf; return StatFile(path, buf, follow_symlinks) && S_ISREG(buf.st_mode); +#endif } /** @@ -138,8 +150,15 @@ FileExists(Path path, bool follow_symlinks = true) static inline bool DirectoryExists(Path path, bool follow_symlinks = true) { +#ifdef WIN32 + (void)follow_symlinks; + + const auto a = GetFileAttributes(path.c_str()); + return a != INVALID_FILE_ATTRIBUTES && (a & FILE_ATTRIBUTE_DIRECTORY); +#else struct stat buf; return StatFile(path, buf, follow_symlinks) && S_ISDIR(buf.st_mode); +#endif } /** @@ -149,8 +168,7 @@ static inline bool PathExists(Path path) { #ifdef WIN32 - struct stat buf; - return StatFile(path, buf); + return GetFileAttributes(path.c_str()) != INVALID_FILE_ATTRIBUTES; #else return CheckAccess(path, F_OK); #endif -- cgit v1.2.3