X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=util.cpp;h=1b76962a2b1e5061209da30acfaff172a8d4e981;hp=c8e26d26aa65e5f36a6fa0b64692e767e176c006;hb=562cf44b96b5c0260d1a1ab18b2dd2408b6d1fc8;hpb=7ddd07eb95bb3216fad47aa6d3eb76a8b2648579

diff --git a/util.cpp b/util.cpp
index c8e26d2..1b76962 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,8 +1,11 @@
+#include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
 
+#include "log.h"
 #include "util.h"
 
 using namespace std;
@@ -10,14 +13,16 @@ using namespace std;
 int make_tempfile(const std::string &contents)
 {
 	char filename[] = "/tmp/cubemap.XXXXXX";
+	mode_t old_umask = umask(0600);
 	int fd = mkstemp(filename);
+	umask(old_umask);
 	if (fd == -1) {
-		perror("mkstemp");
+		log_perror("mkstemp");
 		return -1;
 	}
 
 	if (unlink(filename) == -1) {
-		perror("unlink");
+		log_perror("unlink");
 		// Can still continue;
 	}
 
@@ -26,8 +31,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;
 		}
 
@@ -38,37 +43,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)
 {
+	ssize_t ret, has_read;
+
+	off_t len = lseek(fd, 0, SEEK_END);
+	if (len == -1) {
+		log_perror("lseek");
+		return false;
+	}
+
+	contents->resize(len);
+
 	if (lseek(fd, 0, SEEK_SET) == -1) {
-		perror("lseek");
+		log_perror("lseek");
 		return false;
 	}
 
-	char buf[4096];
-	for ( ;; ) {
-		ssize_t ret = read(fd, buf, sizeof(buf));
+	has_read = 0;
+	while (has_read < len) {
+		ret = read(fd, &((*contents)[has_read]), len - has_read);
 		if (ret == -1) {
-			perror("read");
+			log_perror("read");
 			return false;
 		}
 		if (ret == 0) {
-			// EOF.
-			break;
+			log(ERROR, "Unexpected EOF!");
+			return false;
 		}
-
-		contents->append(string(buf, buf + ret));
+		has_read += ret;
 	}
 
+	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 true;
+	return ret;
 }