Merge pull request #1709 from heinezen/fix/tempfile-linker

Fix definition of static functions for creating temp files/dirs

Author: TheJJ

libopenage/util/file.cpp

@@ -14,9 +14,9 @@
 
 #include "util/filelike/native.h"
 #include "util/filelike/python.h"
+#include "util/fslike/directory.h"
 #include "util/path.h"
 #include "util/strings.h"
-#include "util/fslike/directory.h"
 
 
 namespace openage::util {
@@ -122,13 +122,20 @@ std::ostream &operator<<(std::ostream &stream, const File &file) {
 	return stream;
 }
 
-static File get_temp_file() {
+File File::get_temp_file(bool executable) {
 	fslike::Directory temp_dir = fslike::Directory::get_temp_directory();
 	std::string file_name = std::tmpnam(nullptr);
 	std::ostringstream dir_path;
 	temp_dir.repr(dir_path);
-	mode_t mode = 0777;
-	File file_wrapper = File(dir_path.str() + file_name, mode);
+
+	if (executable) {
+		// 0755 == rwxr-xr-x
+		File file_wrapper = File(dir_path.str() + file_name, 0755);
+		return file_wrapper;
+	}
+
+	// 0644 == rw-r--r--
+	File file_wrapper = File(dir_path.str() + file_name, 0644);
 	return file_wrapper;
 }
 

libopenage/util/file.h

@@ -100,7 +100,7 @@ class OAAPI File {
 	std::vector<std::string> get_lines();
 	std::shared_ptr<filelike::FileLike> get_fileobj() const;
 
-	static File get_temp_file();
+	static File get_temp_file(bool executable = false);
 
 protected:
 	std::shared_ptr<filelike::FileLike> filelike;

libopenage/util/fslike/directory.cpp

@@ -11,8 +11,8 @@
 #include <cstdio>
 #include <dirent.h>
 #include <fcntl.h>
-#include <iostream>
 #include <filesystem>
+#include <iostream>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <utility>
@@ -293,7 +293,7 @@ std::ostream &Directory::repr(std::ostream &stream) {
 	return stream;
 }
 
-static Directory get_temp_directory() {
+Directory Directory::get_temp_directory() {
 	std::string temp_dir_path = std::filesystem::temp_directory_path() / std::tmpnam(nullptr);
 	bool create = true;
 	Directory directory = Directory(temp_dir_path, create);