* lyxfunctional.h: delete compare_memfun and helper classes

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

diff --git a/src/support/getcwd.C b/src/support/getcwd.C
index ec6121cdf8a6db0ce422d6bdfa5ae9a057a34fab..95f7c5ddd9d19dad423e8470492aa438bddfd236 100644 (file)
--- a/src/support/getcwd.C
+++ b/src/support/getcwd.C
@@ -15,6 +15,13 @@
 
 #include "support/lyxlib.h"
 
+#include <boost/scoped_array.hpp>
+
+using boost::scoped_array;
+
+using std::string;
+
+
 namespace {
 
 inline
@@ -35,18 +42,17 @@ 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;
 }