fs/FileInfo: new library providing GetFileInfo()

Replaces StatFile(), with a portable data object.

2 files changed, 114 insertions, 8 deletions

diff --git a/src/fs/CheckFile.cxx b/src/fs/CheckFile.cxx
index bd1798094..0068db639 100644
--- a/src/fs/CheckFile.cxx
+++ b/src/fs/CheckFile.cxx
@@ -21,7 +21,7 @@
 #include "CheckFile.hxx"
 #include "Log.hxx"
 #include "config/ConfigError.hxx"
-#include "FileSystem.hxx"
+#include "FileInfo.hxx"
 #include "Path.hxx"
 #include "AllocatedPath.hxx"
 #include "DirectoryReader.hxx"
@@ -32,15 +32,15 @@
 void
 CheckDirectoryReadable(Path path_fs)
 {
-	struct stat st;
-	if (!StatFile(path_fs, st)) {
-		FormatErrno(config_domain,
-			    "Failed to stat directory \"%s\"",
-			    path_fs.c_str());
+	Error error;
+
+	FileInfo fi;
+	if (!GetFileInfo(path_fs, fi, error)) {
+		LogError(error);
 		return;
 	}
 
-	if (!S_ISDIR(st.st_mode)) {
+	if (!fi.IsDirectory()) {
 		FormatError(config_domain,
 			    "Not a directory: %s", path_fs.c_str());
 		return;
@@ -49,7 +49,7 @@ CheckDirectoryReadable(Path path_fs)
 #ifndef WIN32
 	const auto x = AllocatedPath::Build(path_fs,
 					    PathTraitsFS::CURRENT_DIRECTORY);
-	if (!StatFile(x, st) && errno == EACCES)
+	if (!GetFileInfo(x, fi) && errno == EACCES)
 		FormatError(config_domain,
 			    "No permission to traverse (\"execute\") directory: %s",
 			    path_fs.c_str());
diff --git a/src/fs/FileInfo.hxx b/src/fs/FileInfo.hxx
new file mode 100644
index 000000000..6fe24cb90
--- /dev/null
+++ b/src/fs/FileInfo.hxx
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_FS_FILE_INFO_HXX
+#define MPD_FS_FILE_INFO_HXX
+
+#include "check.h"
+#include "Path.hxx"
+#include "util/Error.hxx"
+
+#include <stdint.h>
+#include <sys/stat.h>
+
+class FileInfo {
+	friend bool GetFileInfo(Path path, FileInfo &info,
+				bool follow_symlinks);
+	friend bool GetFileInfo(Path path, FileInfo &info,
+				Error &error);
+
+	struct stat st;
+
+public:
+	bool IsRegular() const {
+		return S_ISREG(st.st_mode);
+	}
+
+	bool IsDirectory() const {
+		return S_ISDIR(st.st_mode);
+	}
+
+	uint64_t GetSize() const {
+		return st.st_size;
+	}
+
+	time_t GetModificationTime() const {
+		return st.st_mtime;
+	}
+
+#ifndef WIN32
+	uid_t GetUid() const {
+		return st.st_uid;
+	}
+
+	mode_t GetMode() const {
+		return st.st_mode;
+	}
+
+	dev_t GetDevice() const {
+		return st.st_dev;
+	}
+
+	ino_t GetInode() const {
+		return st.st_ino;
+	}
+#endif
+};
+
+inline bool
+GetFileInfo(Path path, FileInfo &info, bool follow_symlinks=true)
+{
+#ifdef WIN32
+	(void)follow_symlinks;
+	return stat(path.c_str(), &info.st) == 0;
+#else
+	int ret = follow_symlinks
+		? stat(path.c_str(), &info.st)
+		: lstat(path.c_str(), &info.st);
+	return ret == 0;
+#endif
+}
+
+inline bool
+GetFileInfo(Path path, FileInfo &info, bool follow_symlinks, Error &error)
+{
+	bool success = GetFileInfo(path, info, follow_symlinks);
+	if (!success) {
+		const auto path_utf8 = path.ToUTF8();
+		error.FormatErrno("Failed to access %s", path_utf8.c_str());
+	}
+
+	return success;
+}
+
+inline bool
+GetFileInfo(Path path, FileInfo &info, Error &error)
+{
+	return GetFileInfo(path, info, true, error);
+}
+
+#endif