lyxserver cleanup patch + andre's small patches

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

diff --git a/src/support/getcwd.C b/src/support/getcwd.C
index f8e096bba1ea4daa9c3919d933f552609f79b6d2..15c12a1acdc31b1922582ec5a3de6fb1aa7301c3 100644 (file)
--- a/src/support/getcwd.C
+++ b/src/support/getcwd.C
@@ -1,10 +1,14 @@
 #include <config.h>
 
+#include <cerrno>
 #include <unistd.h>
 
 #include "support/lyxlib.h"
 
-char * lyx::getcwd(char * buffer, size_t size)
+namespace {
+
+inline
+char * l_getcwd(char * buffer, size_t size)
 {
 #ifndef __EMX__
        return ::getcwd(buffer, size);
@@ -12,3 +16,27 @@ char * lyx::getcwd(char * buffer, size_t size)
        return ::_getcwd2(buffer, size);
 #endif
 }
+
+} // namespace anon
+
+
+// Returns current working directory
+string const lyx::getcwd()
+{
+       int n = 256;    // Assume path is less than 256 chars
+       char * err;
+       char * tbuf = new char[n];
+       
+       // Safe. Hopefully all getcwds behave this way!
+       while (((err = l_getcwd(tbuf, n)) == 0) && (errno == ERANGE)) {
+               // Buffer too small, double the buffersize and try again
+               delete[] tbuf;
+               n = 2 * n;
+               tbuf = new char[n];
+       }
+
+       string result;
+       if (err) result = tbuf;
+       delete[] tbuf;
+       return result;
+}