#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)
+{
+#ifdef HAVE_MKSTEMP
+ return ::mkstemp(templ);
+#else
+#ifdef HAVE_MKTEMP
+ // This probably just barely works...
+ ::mktemp(templ);
+ 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
+
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";
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);