* lyxfunctional.h: delete compare_memfun and helper classes

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

diff --git a/src/support/tempname.C b/src/support/tempname.C
index ee34988735da95631a41f69a3556208295c49a9f..408e332a80b0d92b79517fc5c7fe9d31a1a10f5a 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -1,48 +1,73 @@
-#include <config.h>
+/**
+ * \file tempname.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#include "LString.h"
+#include <config.h>
 
 #include <cstdlib>
-
 #include <unistd.h>
 
-#include "lyxlib.h"
+#include "support/lyxlib.h"
+#include "support/filetools.h"
+#include "support/tostr.h"
 #include "debug.h"
-#include "filetools.h"
+#include "os.h"
+
+#include <boost/scoped_array.hpp>
 
-extern string system_tempdir;
+using boost::scoped_array;
 
-string const lyx::tempName(string const & dir, string const & mask)
+using std::string;
+using std::endl;
+
+namespace {
+
+inline
+int make_tempfile(char * templ)
 {
-#if 0
-       // the tmpnam version...
-       char const * const tmp = ::tmpnam(0);
-       return (tmp) ? tmp : string ();
+#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
-       string tmpdir;
-       if (dir.empty())
-               tmpdir = system_tempdir;
-       else
-               tmpdir = dir;
+#error FIX FIX FIX
+#endif
+}
+
+} // namespace anon
+
+
+string const lyx::support::tempName(string const & dir, string const & mask)
+{
+       string const tmpdir(dir.empty() ? os::getTmpDir() : dir);
        string tmpfl(AddName(tmpdir, mask));
        tmpfl += tostr(getpid());
+       tmpfl += "XXXXXX";
+
+       // The supposedly safe mkstemp version
+       scoped_array<char> tmpl(new char[tmpfl.length() + 1]); // + 1 for '\0'
+       tmpfl.copy(tmpl.get(), string::npos);
+       tmpl[tmpfl.length()] = '\0'; // terminator
 
-       // the supposedly safer mkstemp version
-       char * tmpl = new char[256];
-       tmpfl += ".XXXXXX";
-       ::strcpy(tmpl, tmpfl.c_str());
-       int tmpf = ::mkstemp(tmpl);
+       int const tmpf = make_tempfile(tmpl.get());
        if (tmpf != -1) {
-               string const t(tmpl);
+               string const t(tmpl.get());
                ::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;
-               delete [] tmpl;
+               lyxerr[Debug::FILES]
+                       << "LyX Error: Unable to create temporary file."
+                       << endl;
                return string();
        }
-#endif
 }