* lyxfunctional.h: delete compare_memfun and helper classes

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

diff --git a/src/support/putenv.C b/src/support/putenv.C
index a54c0dff3bc8e1d1d630eac4894bfd2dd275ffdd..83e4e739dff146880232485bbe081428587efac7 100644 (file)
--- a/src/support/putenv.C
+++ b/src/support/putenv.C
@@ -1,9 +1,38 @@
-#include <config.h>
+/**
+ * \file putenv.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author João Luis M. Assirati
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#include <stdlib.h>
+#include <config.h>
 
 #include "lyxlib.h"
-int lyx::putenv(char const * str)
+
+#include <cstdlib>
+#include <string>
+#include <map>
+
+using std::string;
+using std::map;
+
+bool lyx::support::putenv(string const & varname, string const & value)
 {
-       return ::putenv(const_cast<char*>(str));
+       static map<string, char *> varmap;
+
+       string str = varname + '=' + value;
+       char * newptr = new char[str.size() + 1];
+       newptr[str.copy(newptr, string::npos)] = '\0';
+       bool status = (::putenv(newptr) == 0);
+
+       char * oldptr = varmap[varname];
+       if (oldptr)
+               delete oldptr;
+       varmap[varname] = newptr;
+
+       return status;
 }