Respect the TMPDIR environment variable when creating data packs

diff --git a/tool/packer.cpp b/tool/packer.cpp
index 3576472e57b07baa7f2755e9c8012f5b60d0110e..46dd5d242ffc652cf9547bf7eb68bb76bb946a19 100644 (file)
--- a/tool/packer.cpp
+++ b/tool/packer.cpp
@@ -19,17 +19,20 @@ Packer::Packer(DataTool &t):
 
 IO::File *Packer::tempfile()
 {
+       FS::Path tmpdir;
+       const char *tmp_env = getenv("TMPDIR");
+       if(tmp_env)
+               tmpdir = tmp_env;
+       else
+               tmpdir = "/tmp";
+
        for(unsigned i=0;; ++i)
        {
                try
                {
-                       std::string filename = format("/tmp/mspdatatool.%d", i);
-                       /*filename.reserve(25);
-                       filename.append("/tmp/mspdatatool.");
-                       for(unsigned i=0; i<8; ++i)
-                               filename.append(rand());*/
-                       IO::File *file = new IO::File(filename, IO::M_RDWR, IO::File::C_NEW);
-                       FS::unlink(filename);
+                       FS::Path filename = tmpdir/format("mspdatatool.%d", i);
+                       IO::File *file = new IO::File(filename.str(), IO::M_RDWR, IO::File::C_NEW);
+                       FS::unlink(filename.str());
                        return file;
                }
                catch(const IO::file_already_exists &)