Update core loading on android

Use mkstemps to crete an unique path for the core to be copied to and keep its file descriptor around for the whole lifetime of the object opened by dlopen

gframe/dllinterface.cpp

@@ -18,6 +18,12 @@
 #elif defined(EDOPRO_MACOS)
 #define CORENAME EPRO_TEXT("libocgcore.dylib")
 #elif defined(__ANDROID__)
+#include <fcntl.h> //open()
+#include <unistd.h> //close()
+struct AndroidCore {
+	void* library;
+	int fd;
+};
 #if defined(__arm__)
 #define CORENAME EPRO_TEXT("libocgcorev7.so")
 #elif defined(__i386__)
@@ -45,26 +51,54 @@
 #undef CREATE_CLONE
 
 #ifdef _WIN32
-inline void* OpenLibrary(epro::path_stringview path) {
+static inline void* OpenLibrary(epro::path_stringview path) {
 	return LoadLibrary(fmt::format("{}" CORENAME, path).data());
 }
 #define CloseLibrary(core) FreeLibrary((HMODULE)core)
 
 #define GetFunction(core, x) (decltype(x))GetProcAddress((HMODULE)core, #x)
 
-#else
+#elif defined(__ANDROID__)
 
-inline void* OpenLibrary(epro::path_stringview path) {
-#ifdef __ANDROID__
+static void* OpenLibrary(epro::path_stringview path) {
 	void* lib = nullptr;
-	const auto dest_dir = porting::internal_storage + "/libocgcore.so";
-	ygo::Utils::FileCopy(fmt::format("{}" CORENAME, path), dest_dir);
-	lib = dlopen(dest_dir.data(), RTLD_LAZY);
-	ygo::Utils::FileDelete(dest_dir);
-	return lib;
+	auto dest_path = porting::internal_storage + "/libocgcoreXXXXXX.so";
+	auto output = mkstemps(&dest_path[0], 3);
+	if(output == -1)
+		return nullptr;
+	auto input = open(fmt::format("{}" CORENAME, path).data(), O_RDONLY);
+	if(input == -1) {
+		unlink(dest_path.data());
+		close(output);
+		return nullptr;
+	}
+	ygo::Utils::FileCopyFD(input, output);
+	lib = dlopen(dest_path.data(), RTLD_NOW);
+	unlink(dest_path.data());
+	if(!lib) {
+		close(output);
+		return nullptr;
+	}
+	close(input);
+	auto core = new AndroidCore;
+	core->library = lib;
+	core->fd = output;
+	return core;
+}
+
+static inline void CloseLibrary(void* core) {
+	AndroidCore* acore = static_cast<AndroidCore*>(core);
+	dlclose(acore->library);
+	close(acore->fd);
+	delete acore;
+}
+
+#define GetFunction(core, x) (decltype(x))dlsym(static_cast<AndroidCore*>(core)->library, #x)
+
 #else
-	return dlopen(fmt::format("{}" CORENAME, path).data(), RTLD_LAZY);
-#endif
+
+static inline void* OpenLibrary(epro::path_stringview path) {
+	return dlopen(fmt::format("{}" CORENAME, path).data(), RTLD_NOW);
 }
 
 #define CloseLibrary(core) dlclose(core)

gframe/utils.cpp

@@ -96,6 +96,15 @@ namespace ygo {
 		return mkdir(path.data(), 0777) == 0 || errno == EEXIST;
 #endif
 	}
+#ifdef __linux__
+	bool Utils::FileCopyFD(int source, int destination) {
+		off_t bytesCopied = 0;
+		struct stat fileinfo = { 0 };
+		fstat(source, &fileinfo);
+		int result = sendfile(destination, source, &bytesCopied, fileinfo.st_size);
+		return result != -1;
+	}
+#endif
 	bool Utils::FileCopy(epro::path_stringview source, epro::path_stringview destination) {
 		if(source == destination)
 			return false;
@@ -110,13 +119,10 @@ namespace ygo {
 			close(input);
 			return false;
 		}
-		off_t bytesCopied = 0;
-		struct stat fileinfo = { 0 };
-		fstat(input, &fileinfo);
-		int result = sendfile(output, input, &bytesCopied, fileinfo.st_size);
+		auto result = FileCopyFD(output, input);
 		close(input);
 		close(output);
-		return result != -1;
+		return result;
 #elif defined(__APPLE__)
 		return copyfile(source.data(), destination.data(), 0, COPYFILE_ALL) == 0;
 #else

gframe/utils.h

@@ -55,6 +55,9 @@ namespace ygo {
 		static irr::IOSOperator* OSOperator;
 		static epro::path_string working_dir;
 		static bool MakeDirectory(epro::path_stringview path);
+#ifdef __linux__
+		static bool FileCopyFD(int source, int destination);
+#endif
 		static bool FileCopy(epro::path_stringview source, epro::path_stringview destination);
 		static bool FileMove(epro::path_stringview source, epro::path_stringview destination);
 		static bool FileExists(epro::path_stringview path);