X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fenvironment.cpp;h=a364725c21173c137c00960c0ba3ea2cc3bb9270;hb=51c380440b0b2d5f04158e67047727ba1f985dc4;hp=e3469f1fa3169dbac2e62471b5694a628d773e53;hpb=a4afd7b7e96886694895221aff792f36e7720c89;p=lyx.git

diff --git a/src/support/environment.cpp b/src/support/environment.cpp
index e3469f1fa3..a364725c21 100644
--- a/src/support/environment.cpp
+++ b/src/support/environment.cpp
@@ -4,8 +4,8 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
- * \author João Luis M. Assirati
- * \author Lars Gullik Bjønnes
+ * \author João Luis M. Assirati
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,6 +13,8 @@
 #include <config.h>
 
 #include "support/environment.h"
+
+#include "support/docstring.h"
 #include "support/os.h"
 
 #include <boost/tokenizer.hpp>
@@ -21,9 +23,7 @@
 #include <map>
 #include <sstream>
 
-using std::string;
-using std::vector;
-
+using namespace std;
 
 namespace lyx {
 namespace support {
@@ -47,7 +47,7 @@ vector<string> const getEnvPath(string const & name)
 	Tokenizer::const_iterator it = tokens.begin();
 	Tokenizer::const_iterator const end = tokens.end();
 
-	std::vector<string> vars;
+	vector<string> vars;
 	for (; it != end; ++it)
 		vars.push_back(os::internal_path(*it));
 
@@ -62,26 +62,12 @@ bool setEnv(string const & name, string const & value)
 
 	string const encoded = to_local8bit(from_utf8(value));
 #if defined (HAVE_SETENV)
-	return ::setenv(name.c_str(), encoded.c_str(), true) == 0;
-#endif
-
-#if defined (HAVE_PUTENV)
-	static std::map<string, char *> varmap;
-
-	string envstr = name + '=' + encoded;
-	char * newptr = new char[envstr.size() + 1];
-	envstr.copy(newptr, envstr.length());
-	newptr[envstr.length()] = '\0';
-	int const retval = ::putenv(newptr);
-
-	char * oldptr = varmap[name];
-	if (oldptr)
-		delete oldptr;
-	varmap[name] = newptr;
-	return retval == 0;
-#endif
-
-#if !(defined HAVE_SETENV) && !(defined HAVE_PUTENV)
+	return ::setenv(name.c_str(), encoded.c_str(), 1) == 0;
+#elif defined (HAVE_PUTENV)
+	static map<string, string> varmap;
+	varmap[name] = name + '=' + encoded;
+	return ::putenv(const_cast<char*>(varmap[name].c_str())) == 0;
+#else
 #error No environment-setting function has been defined.
 #endif
 	return false;
@@ -91,7 +77,7 @@ bool setEnv(string const & name, string const & value)
 void setEnvPath(string const & name, vector<string> const & env)
 {
 	char const separator(os::path_separator());
-	std::ostringstream ss;
+	ostringstream ss;
 	vector<string>::const_iterator const begin = env.begin();
 	vector<string>::const_iterator const end = env.end();
 	vector<string>::const_iterator it = begin;
@@ -123,7 +109,7 @@ void prependEnvPath(string const & name, string const & prefix)
 	token_iterator const end = reversed_tokens.rend();
 	for (; it != end; ++it) {
 		vector<string>::iterator remove_it =
-			std::remove(env_var.begin(), env_var.end(), *it);
+			remove(env_var.begin(), env_var.end(), *it);
 		env_var.erase(remove_it, env_var.end());
 		env_var.insert(env_var.begin(), *it);
 	}