X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=util.cpp;h=a85de446a87f9451610f90c401f716e2fab86e5e;hp=2bbffdc13c1aeafe0224014060b23043eca47fb1;hb=b757a4a2ce9d24835b52a185134835762af2f50c;hpb=0cb56be70f7ca4f4564eea892a99d20032359a1d

diff --git a/util.cpp b/util.cpp
index 2bbffdc..a85de44 100644
--- a/util.cpp
+++ b/util.cpp
@@ -2,29 +2,37 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
 
 #include "log.h"
 #include "util.h"
 
+#ifndef O_TMPFILE
+#define __O_TMPFILE 020000000
+#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
+#endif
+
 using namespace std;
 
-int make_tempfile(const std::string &contents)
+int make_tempfile(const string &contents)
 {
-	char filename[] = "/tmp/cubemap.XXXXXX";
-	mode_t old_umask = umask(0600);
-	int fd = mkstemp(filename);
-	umask(old_umask);
+	int fd = open("/tmp", O_RDWR | O_TMPFILE, 0600);
 	if (fd == -1) {
-		log_perror("mkstemp");
-		return -1;
-	}
+		char filename[] = "/tmp/cubemap.XXXXXX";
+		mode_t old_umask = umask(077);
+		fd = mkstemp(filename);
+		if (fd == -1) {
+			log_perror("mkstemp");
+			return -1;
+		}
+		umask(old_umask);
 
-	if (unlink(filename) == -1) {
-		log_perror("unlink");
-		// Can still continue;
+		if (unlink(filename) == -1) {
+			log_perror("unlink");
+			// Can still continue.
+		}
 	}
 
 	const char *ptr = contents.data();
@@ -44,14 +52,14 @@ int make_tempfile(const std::string &contents)
 	return fd;
 }
 
-bool read_tempfile_and_close(int fd, std::string *contents)
+bool read_tempfile_and_close(int fd, string *contents)
 {
 	bool ok = read_tempfile(fd, contents);
 	safe_close(fd);  // Implicitly deletes the file.
 	return ok;
 }
 
-bool read_tempfile(int fd, std::string *contents)
+bool read_tempfile(int fd, string *contents)
 {
 	ssize_t ret, has_read;