From e2dae4345b7cb9ec92e204a8bf2ab3dee8fcb9ac Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 21 Feb 2023 00:48:02 +0000
Subject: Add checked_fopen wrapper and FileStar container

---
 lib/filesystem.cpp | 9 +++++++++
 lib/filesystem.h   | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/lib/filesystem.cpp b/lib/filesystem.cpp
index 0e19e8d..7e8ab9c 100644
--- a/lib/filesystem.cpp
+++ b/lib/filesystem.cpp
@@ -62,4 +62,13 @@ namespace filesystem {
 	{
 		return memmap {length, prot, flags, h, static_cast<off_t>(offset)};
 	}
+
+	FILE *
+	checked_fopen(const char * pathname, const char * mode)
+	{
+		if (auto file = fopen(pathname, mode)) {
+			return file;
+		}
+		throw_filesystem_error("fopen", errno, pathname);
+	}
 }
diff --git a/lib/filesystem.h b/lib/filesystem.h
index 0c44236..5315183 100644
--- a/lib/filesystem.h
+++ b/lib/filesystem.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include "ptr.hpp"
 #include "special_members.hpp"
 #include <cstddef>
+#include <cstdio>
 #include <sys/types.h>
 
 namespace filesystem {
@@ -39,4 +41,7 @@ namespace filesystem {
 	private:
 		int h;
 	};
+
+	FILE * checked_fopen(const char * pathname, const char * mode);
+	using FileStar = wrapped_ptrt<FILE, &checked_fopen, &fclose>;
 }
-- 
cgit v1.2.3