#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;
-static inline
-int make_tempfile(char * templ)
+namespace {
+
+inline
+int make_tempfile(char * templ)
{
-#ifdef HAVE_MKSTEMP
+#if defined(HAVE_MKSTEMP)
return ::mkstemp(templ);
-#else
-#ifdef HAVE_MKTEMP
+#elif defined(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
-#warning FIX FIX FIX
-#endif
+#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";
char * tmpl = new char[tmpfl.length() + 1]; // + 1 for '\0'
tmpfl.copy(tmpl, string::npos);
tmpl[tmpfl.length()] = '\0'; // terminator
-
+
int const tmpf = make_tempfile(tmpl);
if (tmpf != -1) {
string const t(tmpl);