hopefully fix tex2lyx linking.

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

diff --git a/src/support/getcwd.C b/src/support/getcwd.C
index fb9d531715853a4b145852813bfc326be32ffd7e..40b61a6a2609410f5e9e394ad683d5c580551182 100644 (file)
--- a/src/support/getcwd.C
+++ b/src/support/getcwd.C
@@ -10,11 +10,23 @@
 
 #include <config.h>
 
+#include "support/lyxlib.h"
+
+#include <boost/scoped_array.hpp>
+
 #include <cerrno>
-#include <unistd.h>
 
-#include "support/lyxlib.h"
 
+namespace lyx {
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifdef _WIN32
+# include <windows.h>
+#endif
+
+using boost::scoped_array;
 
 using std::string;
 
@@ -24,10 +36,11 @@ namespace {
 inline
 char * l_getcwd(char * buffer, size_t size)
 {
-#ifndef __EMX__
-       return ::getcwd(buffer, size);
+#ifdef _WIN32
+       GetCurrentDirectory(size, buffer);
+       return buffer;
 #else
-       return ::_getcwd2(buffer, size);
+       return ::getcwd(buffer, size);
 #endif
 }
 
@@ -39,18 +52,20 @@ string const lyx::support::getcwd()
 {
        int n = 256;    // Assume path is less than 256 chars
        char * err;
-       char * tbuf = new char[n];
+       scoped_array<char> tbuf(new char[n]);
 
        // Safe. Hopefully all getcwds behave this way!
-       while (((err = l_getcwd(tbuf, n)) == 0) && (errno == ERANGE)) {
+       while (((err = l_getcwd(tbuf.get(), n)) == 0) && (errno == ERANGE)) {
                // Buffer too small, double the buffersize and try again
-               delete[] tbuf;
-               n = 2 * n;
-               tbuf = new char[n];
+               n *= 2;
+               tbuf.reset(new char[n]);
        }
 
        string result;
-       if (err) result = tbuf;
-       delete[] tbuf;
+       if (err)
+               result = tbuf.get();
        return result;
 }
+
+
+} // namespace lyx