Use smart pointers

native/jni/utils/files.h

@@ -6,6 +6,11 @@
 #define do_align(p, a)  (((p) + (a) - 1) / (a) * (a))
 #define align_off(p, a) (do_align(p, a) - (p))
 
+using sFILE = std::unique_ptr<FILE, decltype(&fclose)>;
+static inline sFILE make_sFILE(FILE *fp = nullptr) {
+	return sFILE(fp, fclose);
+}
+
 struct file_attr {
 	struct stat st;
 	char con[128];

native/jni/utils/include/stream.h

@@ -1,16 +1,19 @@
 #pragma once
 
-#include <unistd.h>
 #include <stdio.h>
 #include <memory>
 
+#include "../files.h"
+
 class stream;
 
-FILE *open_stream(stream *strm);
+using stream_ptr = std::unique_ptr<stream>;
+
+sFILE make_stream(stream_ptr &&strm);
 
 template <class T, class... Args>
-FILE *open_stream(Args &&... args) {
-	return open_stream(new T(args...));
+sFILE make_stream(Args &&... args) {
+	return make_stream(stream_ptr(new T(std::forward<Args>(args)...)));
 }
 
 class stream {
@@ -24,20 +27,20 @@ public:
 // Delegates all operations to the base FILE pointer
 class filter_stream : public stream {
 public:
-	filter_stream(FILE *fp) : fp(fp) {}
-	~filter_stream() override;
+	filter_stream() = default;
+	filter_stream(sFILE &&fp) : fp(std::move(fp)) {}
 
 	int read(void *buf, size_t len) override;
 	int write(const void *buf, size_t len) override;
 
-	void set_base(FILE *f);
+	void set_base(sFILE &&f);
 	template <class T, class... Args >
 	void set_base(Args&&... args) {
-		set_base(open_stream<T>(args...));
+		set_base(make_stream<T>(std::forward<Args>(args)...));
 	}
 
 protected:
-	FILE *fp;
+	sFILE fp;
 };
 
 // Handy interface for classes that need custom seek logic
@@ -65,7 +68,7 @@ private:
 	size_t _cap = 0;
 
 	void resize(size_t new_pos, bool zero = false);
-	size_t end_pos() override { return _len; }
+	size_t end_pos() final { return _len; }
 };
 
 // File stream but does not close the file descriptor at any time

native/jni/utils/stream.cpp

@@ -23,10 +23,9 @@ static int strm_close(void *v) {
 	return 0;
 }
 
-FILE *open_stream(stream *strm) {
-	FILE *fp = funopen(strm, strm_read, strm_write, strm_seek, strm_close);
-	// Disable buffering
-	setbuf(fp, nullptr);
+sFILE make_stream(stream_ptr &&strm) {
+	sFILE fp(funopen(strm.release(), strm_read, strm_write, strm_seek, strm_close), fclose);
+	setbuf(fp.get(), nullptr);
 	return fp;
 }
 
@@ -45,21 +44,16 @@ off_t stream::seek(off_t off, int whence) {
 	return -1;
 }
 
-filter_stream::~filter_stream() {
-	if (fp) fclose(fp);
-}
-
 int filter_stream::read(void *buf, size_t len) {
-	return fread(buf, 1, len, fp);
+	return fread(buf, 1, len, fp.get());
 }
 
 int filter_stream::write(const void *buf, size_t len) {
-	return fwrite(buf, 1, len, fp);
+	return fwrite(buf, 1, len, fp.get());
 }
 
-void filter_stream::set_base(FILE *f) {
-	if (fp) fclose(fp);
-	fp = f;
+void filter_stream::set_base(sFILE &&f) {
+	fp = std::move(f);
 }
 
 off_t seekable_stream::seek_pos(off_t off, int whence) {