1 files changed, 21 insertions, 14 deletions
diff --git a/src/fs/FileSystem.hxx b/src/fs/FileSystem.hxx
index cb2f82d22..e9751c73b 100644
--- a/src/fs/FileSystem.hxx
+++ b/src/fs/FileSystem.hxx
@@ -28,7 +28,6 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <assert.h>
 #include <stdio.h>
 
 class AllocatedPath;
@@ -37,39 +36,39 @@ namespace FOpenMode {
 	/**
 	 * Open mode for reading text files.
 	 */
-	constexpr PathTraits::const_pointer ReadText = "r";
+	constexpr PathTraitsFS::const_pointer ReadText = "r";
 
 	/**
 	 * Open mode for reading binary files.
 	 */
-	constexpr PathTraits::const_pointer ReadBinary = "rb";
+	constexpr PathTraitsFS::const_pointer ReadBinary = "rb";
 
 	/**
 	 * Open mode for writing text files.
 	 */
-	constexpr PathTraits::const_pointer WriteText = "w";
+	constexpr PathTraitsFS::const_pointer WriteText = "w";
 
 	/**
 	 * Open mode for writing binary files.
 	 */
-	constexpr PathTraits::const_pointer WriteBinary = "wb";
+	constexpr PathTraitsFS::const_pointer WriteBinary = "wb";
 
 	/**
 	 * Open mode for appending text files.
 	 */
-	constexpr PathTraits::const_pointer AppendText = "a";
+	constexpr PathTraitsFS::const_pointer AppendText = "a";
 
 	/**
 	 * Open mode for appending binary files.
 	 */
-	constexpr PathTraits::const_pointer AppendBinary = "ab";
+	constexpr PathTraitsFS::const_pointer AppendBinary = "ab";
 }
 
 /**
  * Wrapper for fopen() that uses #Path names.
  */
 static inline FILE *
-FOpen(Path file, PathTraits::const_pointer mode)
+FOpen(Path file, PathTraitsFS::const_pointer mode)
 {
 	return fopen(file.c_str(), mode);
 }
@@ -132,20 +131,28 @@ MakeFifo(Path path, mode_t mode)
 	return mkfifo(path.c_str(), mode) == 0;
 }
 
-#endif
-
 /**
  * Wrapper for access() that uses #Path names.
  */
 static inline bool
 CheckAccess(Path path, int mode)
 {
+	return access(path.c_str(), mode) == 0;
+}
+
+#endif
+
+/**
+ * Checks is specified path exists and accessible.
+ */
+static inline bool
+CheckAccess(Path path)
+{
 #ifdef WIN32
-	(void)path;
-	(void)mode;
-	return true;
+	struct stat buf;
+	return StatFile(path, buf);
 #else
-	return access(path.c_str(), mode) == 0;
+	return CheckAccess(path, F_OK);
 #endif
 }