Add suppor for raw (non-Metacube) inputs over HTTP. Only really useful for TS.

[cubemap] / util.cpp

diff --git a/util.cpp b/util.cpp
index 25a8da4a1e8893ca2407615d418aeab7fffe81d5..a85de446a87f9451610f90c401f716e2fab86e5e 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -2,28 +2,37 @@
 #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)
+int make_tempfile(const string &contents)
 {
-       char filename[] = "/tmp/cubemap.XXXXXX";
-       mode_t old_umask = umask(077);
-       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();
@@ -43,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;