#include <config.h>
-#include "LString.h"
-
#include <cstdlib>
-
#include <unistd.h>
-#include "lyxlib.h"
+#include "LString.h"
+#include "support/lyxlib.h"
+#include "support/filetools.h"
#include "debug.h"
-#include "filetools.h"
+
+using std::endl;
extern string system_tempdir;
-string const lyx::tempName(string const & dir, string const & mask)
+namespace {
+
+inline
+int make_tempfile(char * templ)
{
-#if 0
- // the tmpnam version...
- char const * const tmp = ::tmpnam(0);
- return (tmp) ? tmp : string ();
+#ifdef HAVE_MKSTEMP
+ return ::mkstemp(templ);
#else
- string tmpdir;
- if (dir.empty())
- tmpdir = system_tempdir;
- else
- tmpdir = dir;
+#ifdef HAVE_MKTEMP
+ // This probably just barely works...
+ ::mktemp(templ);
+ return ::open(templ, 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 tmpfl(AddName(tmpdir, mask));
tmpfl += tostr(getpid());
+ tmpfl += "XXXXXX";
- // the supposedly safer mkstemp version
- char * tmpl = new char[256];
- tmpfl += ".XXXXXX";
- ::strcpy(tmpl, tmpfl.c_str());
- int tmpf = ::mkstemp(tmpl);
+ // The supposedly safe mkstemp version
+ 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);
::close(tmpf);
delete [] tmpl;
- lyxerr << "Temporary file `" << t << "' created." << endl;
+ lyxerr[Debug::FILES] << "Temporary file `" << t
+ << "' created." << endl;
return t;
} else {
- lyxerr << "LyX Error: Unable to create temporary file."
- << endl;
+ lyxerr[Debug::FILES]
+ << "LyX Error: Unable to create temporary file."
+ << endl;
delete [] tmpl;
return string();
}
-#endif
}