another safety belt

[lyx.git] / src / support / tempname.C

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 8139a32b6364f4bcba14f1844e071acfd245043f..f15ec1a6f0d63fc38a93e6a2eb9cb69b5dd1b930 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -6,15 +6,35 @@
 #include "LString.h"
 #include "support/lyxlib.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "debug.h"
+#include "os.h"
 
 using std::endl;
 
-extern string system_tempdir;
+
+namespace {
+
+inline
+int make_tempfile(char * templ)
+{
+#if defined(HAVE_MKSTEMP)
+       return ::mkstemp(templ);
+#elif defined(HAVE_MKTEMP)
+       // This probably just barely works...
+       ::mktemp(templ);
+       return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+#else
+#error FIX FIX FIX
+#endif
+}
+
+} // namespace anon
+
 
 string const lyx::tempName(string const & dir, string const & mask)
 {
-       string const tmpdir(dir.empty() ? system_tempdir : dir);
+       string const tmpdir(dir.empty() ? os::getTmpDir() : dir);
        string tmpfl(AddName(tmpdir, mask));
        tmpfl += tostr(getpid());
        tmpfl += "XXXXXX";
@@ -23,8 +43,8 @@ string const lyx::tempName(string const & dir, string const & mask)
        char * tmpl = new char[tmpfl.length() + 1]; // + 1 for '\0'
        tmpfl.copy(tmpl, string::npos);
        tmpl[tmpfl.length()] = '\0'; // terminator
-       
-       int const tmpf = ::mkstemp(tmpl);
+
+       int const tmpf = make_tempfile(tmpl);
        if (tmpf != -1) {
                string const t(tmpl);
                ::close(tmpf);