lyxserver cleanup patch + andre's small patches

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

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 791e586bd9e0d1765043cac9bda5eb54bc5945ab..614146f2c4dc15a6f8d2dda8fb6e7382558c36ff 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -6,11 +6,12 @@
 #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 {
 
@@ -23,11 +24,13 @@ int make_tempfile(char * templ)
 #ifdef HAVE_MKTEMP
        // This probably just barely works...
        ::mktemp(templ);
-       return ::open(templ, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+       return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 #else
+#ifdef WITH_WARNINGS
 #warning FIX FIX FIX
 #endif
 #endif
+#endif
 }
 
 } // namespace anon
@@ -35,7 +38,7 @@ int make_tempfile(char * templ)
 
 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";