* src/encoding.C (latexChar,read):

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

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 18826367c2a70d5cfa532bfe93c9a86441eed249..2e0783d2e223ab0802bb84bb96230b93ea2b3571 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -11,20 +11,32 @@
 #include <config.h>
 
 #include "support/lyxlib.h"
-#include "support/filetools.h"
+
 #include "support/convert.h"
-#include "support/os.h"
+#include "support/filetools.h"
+#include "support/package.h"
 
 #include "debug.h"
 
 #include <boost/scoped_array.hpp>
 
 #include <cstdlib>
-#include <unistd.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
 # include <fcntl.h>
-# include <sys/stat.h>
+# ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+# endif
+# ifdef HAVE_IO_H
+#  include <io.h>
+# endif
+# ifdef HAVE_PROCESS_H
+#  include <process.h>
+# endif
 #endif
 
 using boost::scoped_array;
@@ -32,6 +44,9 @@ using boost::scoped_array;
 using std::string;
 using std::endl;
 
+namespace lyx {
+namespace support {
+
 namespace {
 
 inline
@@ -42,7 +57,19 @@ int make_tempfile(char * templ)
 #elif defined(HAVE_MKTEMP)
        // This probably just barely works...
        ::mktemp(templ);
+# if defined (HAVE_OPEN)
+# if (!defined S_IRUSR)
+#   define S_IRUSR S_IREAD
+#   define S_IWUSR S_IWRITE
+# endif
        return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+# elif defined (HAVE__OPEN)
+       return ::_open(templ,
+                      _O_RDWR | _O_CREAT | _O_EXCL,
+                      _S_IREAD | _S_IWRITE);
+# else
+#  error No open() function.
+# endif
 #else
 #error FIX FIX FIX
 #endif
@@ -51,11 +78,18 @@ int make_tempfile(char * templ)
 } // namespace anon
 
 
-string const lyx::support::tempName(string const & dir, string const & mask)
+FileName const tempName(FileName const & dir, string const & mask)
 {
-       string const tmpdir(dir.empty() ? os::getTmpDir() : dir);
-       string tmpfl(AddName(tmpdir, mask));
+       // FIXME UNICODE encoding of package().temp_dir() is probably wrong
+       string const tmpdir(dir.empty() ? package().temp_dir() : dir.toFilesystemEncoding());
+       string tmpfl(addName(tmpdir, mask));
+#if defined (HAVE_GETPID)
        tmpfl += convert<string>(getpid());
+#elif defined (HAVE__GETPID)
+       tmpfl += convert<string>(_getpid());
+#else
+# error No getpid() function
+#endif
        tmpfl += "XXXXXX";
 
        // The supposedly safe mkstemp version
@@ -66,14 +100,23 @@ string const lyx::support::tempName(string const & dir, string const & mask)
        int const tmpf = make_tempfile(tmpl.get());
        if (tmpf != -1) {
                string const t(tmpl.get());
+#if defined (HAVE_CLOSE)
                ::close(tmpf);
+#elif defined (HAVE__CLOSE)
+               ::_close(tmpf);
+#else
+# error No x() function.
+#endif
                lyxerr[Debug::FILES] << "Temporary file `" << t
                                     << "' created." << endl;
-               return t;
+               return FileName(t);
        } else {
                lyxerr[Debug::FILES]
                        << "LyX Error: Unable to create temporary file."
                        << endl;
-               return string();
+               return FileName();
        }
 }
+
+} // namespace support
+} // namespace lyx