X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=util.cpp;h=dadeb379cd6d4be0154d1de53de1ef6a7d551183;hp=b79c6c3dccd5e0a58ca2f25a09b28c6d223bdd64;hb=9b5a1e6241a5281ddefea4d43ae82ef7cf9a6d32;hpb=14aa32dce539ac645ba10e8c488fb5a435ffa314

diff --git a/util.cpp b/util.cpp
index b79c6c3..dadeb37 100644
--- a/util.cpp
+++ b/util.cpp
@@ -2,24 +2,35 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <fcntl.h>
+#include <sys/stat.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)
 {
 	char filename[] = "/tmp/cubemap.XXXXXX";
-	int fd = mkstemp(filename);
+	int fd = open(filename, O_RDWR | O_TMPFILE, 0600);
 	if (fd == -1) {
-		perror("mkstemp");
-		return -1;
-	}
+		fd = mkstemp(filename);
+		if (fd == -1) {
+			log_perror("mkstemp");
+			return -1;
+		}
 
-	if (unlink(filename) == -1) {
-		perror("unlink");
-		// Can still continue;
+		if (unlink(filename) == -1) {
+			log_perror("unlink");
+			// Can still continue.
+		}
 	}
 
 	const char *ptr = contents.data();
@@ -27,8 +38,8 @@ int make_tempfile(const std::string &contents)
 	while (to_write > 0) {
 		ssize_t ret = write(fd, ptr, to_write);
 		if (ret == -1) {
-			perror("write");
-			close(fd);
+			log_perror("write");
+			safe_close(fd);
 			return -1;
 		}
 
@@ -39,51 +50,57 @@ int make_tempfile(const std::string &contents)
 	return fd;
 }
 
+bool read_tempfile_and_close(int fd, std::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 ok = true;
 	ssize_t ret, has_read;
 
 	off_t len = lseek(fd, 0, SEEK_END);
 	if (len == -1) {
-		perror("lseek");
-		ok = false;
-		goto done;
+		log_perror("lseek");
+		return false;
 	}
 
 	contents->resize(len);
 
 	if (lseek(fd, 0, SEEK_SET) == -1) {
-		perror("lseek");
-		ok = false;
-		goto done;
+		log_perror("lseek");
+		return false;
 	}
 
 	has_read = 0;
 	while (has_read < len) {
 		ret = read(fd, &((*contents)[has_read]), len - has_read);
 		if (ret == -1) {
-			perror("read");
-			ok = false;
-			goto done;
+			log_perror("read");
+			return false;
 		}
 		if (ret == 0) {
-			fprintf(stderr, "Unexpected EOF!\n");
-			ok = false;
-			goto done;
+			log(ERROR, "Unexpected EOF!");
+			return false;
 		}
 		has_read += ret;
 	}
 
-done:
+	return true;
+}
+
+int safe_close(int fd)
+{
+	int ret;
 	do {
-		ret = close(fd);  // Implicitly deletes the files.
+		ret = close(fd);
 	} while (ret == -1 && errno == EINTR);
-	
+
 	if (ret == -1) {
-		perror("close");
-		// Can still continue.
+		log_perror("close()");
 	}
 
-	return ok;
+	return ret;
 }