Consistent use of preprocessor guards;

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

diff --git a/src/support/tempname.C b/src/support/tempname.C
index deeb90cf56dd67cb2e79509dc6c77f471ccaa3be..18699223a6b1952f48e4b9857c3ce65b09e57c3b 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -10,16 +10,31 @@
 
 #include <config.h>
 
-#include <cstdlib>
-#include <unistd.h>
-
-#include "LString.h"
 #include "support/lyxlib.h"
+
+#include "support/convert.h"
 #include "support/filetools.h"
-#include "support/tostr.h"
+#include "support/package.h"
+
 #include "debug.h"
-#include "os.h"
 
+#include <boost/scoped_array.hpp>
+
+#include <cstdlib>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
+# include <fcntl.h>
+# ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+# endif
+#endif
+
+using boost::scoped_array;
+
+using std::string;
 using std::endl;
 
 namespace {
@@ -43,21 +58,20 @@ int make_tempfile(char * templ)
 
 string const lyx::support::tempName(string const & dir, string const & mask)
 {
-       string const tmpdir(dir.empty() ? os::getTmpDir() : dir);
+       string const tmpdir(dir.empty() ? package().temp_dir() : dir);
        string tmpfl(AddName(tmpdir, mask));
-       tmpfl += tostr(getpid());
+       tmpfl += convert<string>(getpid());
        tmpfl += "XXXXXX";
 
        // The supposedly safe mkstemp version
-       char * tmpl = new char[tmpfl.length() + 1]; // + 1 for '\0'
-       tmpfl.copy(tmpl, string::npos);
+       scoped_array<char> tmpl(new char[tmpfl.length() + 1]); // + 1 for '\0'
+       tmpfl.copy(tmpl.get(), string::npos);
        tmpl[tmpfl.length()] = '\0'; // terminator
 
-       int const tmpf = make_tempfile(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[Debug::FILES] << "Temporary file `" << t
                                     << "' created." << endl;
                return t;
@@ -65,7 +79,6 @@ string const lyx::support::tempName(string const & dir, string const & mask)
                lyxerr[Debug::FILES]
                        << "LyX Error: Unable to create temporary file."
                        << endl;
-               delete [] tmpl;
                return string();
        }
 }