fs/FileInfo: add fstat() wrapper

MusicPlayerDaemon · Oct 7, 2023 · 3418299 · 3418299
1 parent 1ca5d6b
commit 3418299
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/fs/FileInfo.cxx b/src/fs/FileInfo.cxx
@@ -8,6 +8,8 @@
 #ifdef _WIN32
 #include <windef.h> // for HWND (needed by winbase.h)
 #include <winbase.h> // for FILE_*_INFO
+#else
+#include "io/FileDescriptor.hxx"
 #endif
 
 FileInfo::FileInfo(Path path, bool follow_symlinks)
@@ -55,4 +57,12 @@ GetFileInfoByHandle(HANDLE handle, FileInfo &info) noexcept
 	return true;
 }
 
+#else
+
+FileInfo::FileInfo(FileDescriptor fd)
+{
+	if (fstat(fd.Get(), &st) < 0)
+		throw MakeErrno("Failed to access file");
+}
+
 #endif // _WIN32
diff --git a/src/fs/FileInfo.hxx b/src/fs/FileInfo.hxx
@@ -14,15 +14,15 @@
 #include <chrono>
 #include <cstdint>
 
+class FileDescriptor;
+
 class FileInfo {
 	friend bool GetFileInfo(Path path, FileInfo &info,
 				bool follow_symlinks) noexcept;
 #ifdef _WIN32
 	friend bool GetFileInfoByHandle(HANDLE handle, FileInfo &info) noexcept;
 #endif
 
-	friend class FileReader;
-
 #ifdef _WIN32
 	WIN32_FILE_ATTRIBUTE_DATA data;
 #else
@@ -36,6 +36,8 @@ public:
 
 #ifdef _WIN32
 	explicit FileInfo(HANDLE handle);
+#else
+	explicit FileInfo(FileDescriptor fd);
 #endif
 
 	constexpr bool IsRegular() const noexcept {

diff --git a/src/io/FileReader.cxx b/src/io/FileReader.cxx
@@ -73,12 +73,7 @@ FileReader::GetFileInfo() const
 {
 	assert(IsDefined());
 
-	FileInfo info;
-	const bool success = fstat(fd.Get(), &info.st) == 0;
-	if (!success)
-		throw MakeErrno("Failed to access file");
-
-	return info;
+	return FileInfo{fd};
 }
 
 std::size_t