X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fenvironment.cpp;h=091fa278c015cfa4bc204f2d3b8d2271151a3fcc;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=d766bd583ef89ce5b91a8558371fc6326e3e1830;hpb=dbda8edf6df0b72c1fb1d598e3a0b4c0af8449f7;p=lyx.git

diff --git a/src/support/environment.cpp b/src/support/environment.cpp
index d766bd583e..091fa278c0 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.
  */
@@ -15,45 +15,40 @@
 #include "support/environment.h"
 
 #include "support/docstring.h"
+#include "support/lstrings.h"
 #include "support/os.h"
 
-#include <boost/tokenizer.hpp>
-
+#include <algorithm> // for remove
 #include <cstdlib>
 #include <map>
 #include <sstream>
 
-using std::string;
-using std::vector;
-
+using namespace std;
 
 namespace lyx {
 namespace support {
 
-string const getEnv(string const & envname)
+
+bool hasEnv(string const & name)
+{
+	return getenv(name.c_str());
+}
+
+
+string const getEnv(string const & name)
 {
 	// f.ex. what about error checking?
-	char const * const ch = getenv(envname.c_str());
+	char const * const ch = getenv(name.c_str());
 	return ch ? to_utf8(from_local8bit(ch)) : string();
 }
 
 
 vector<string> const getEnvPath(string const & name)
 {
-	typedef boost::char_separator<char> Separator;
-	typedef boost::tokenizer<Separator> Tokenizer;
-
 	string const env_var = getEnv(name);
-	Separator const separator(string(1, os::path_separator()).c_str());
-	Tokenizer const tokens(env_var, separator);
-	Tokenizer::const_iterator it = tokens.begin();
-	Tokenizer::const_iterator const end = tokens.end();
+	string const separator(1, os::path_separator());
 
-	std::vector<string> vars;
-	for (; it != end; ++it)
-		vars.push_back(os::internal_path(*it));
-
-	return vars;
+	return getVectorFromString(env_var, separator);
 }
 
 
@@ -64,11 +59,16 @@ 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);
+	return ::setenv(name.c_str(), encoded.c_str(), 1) == 0;
 #elif defined (HAVE_PUTENV)
-	static std::map<string, string> varmap;
+	// According to http://pubs.opengroup.org/onlinepubs/9699919799/functions/putenv.html
+	// the argument of putenv() needs to be static, because changing its
+	// value will change the environment. Therefore we need a different static
+	// storage for each variable.
+	// FIXME THREAD
+	static map<string, string> varmap;
 	varmap[name] = name + '=' + encoded;
-	return ::putenv(varmap[name].c_str()) == 0;
+	return ::putenv(const_cast<char*>(varmap[name].c_str())) == 0;
 #else
 #error No environment-setting function has been defined.
 #endif
@@ -79,7 +79,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;
@@ -94,24 +94,19 @@ void setEnvPath(string const & name, vector<string> const & env)
 
 void prependEnvPath(string const & name, string const & prefix)
 {
+	string const separator(1, os::path_separator());
+	vector<string> reversed_tokens
+		= getVectorFromString(prefix, separator);
 	vector<string> env_var = getEnvPath(name);
 
-	typedef boost::char_separator<char> Separator;
-	typedef boost::tokenizer<Separator> Tokenizer;
-
-	Separator const separator(string(1, os::path_separator()).c_str());
-
 	// Prepend each new element to the list, removing identical elements
 	// that occur later in the list.
-	Tokenizer const tokens(prefix, separator);
-	vector<string> reversed_tokens(tokens.begin(), tokens.end());
-
 	typedef vector<string>::const_reverse_iterator token_iterator;
 	token_iterator it = reversed_tokens.rbegin();
 	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);
 	}
@@ -119,5 +114,22 @@ void prependEnvPath(string const & name, string const & prefix)
 	setEnvPath(name, env_var);
 }
 
+
+bool unsetEnv(string const & name)
+{
+#if defined(HAVE_UNSETENV)
+	// FIXME: does it leak?
+	return ::unsetenv(name.c_str()) == 0;
+#elif defined(HAVE_PUTENV)
+	// This is OK with MSVC and MinGW at least.
+	// The argument of putenv() does not need to be a static variable in this
+	// case, since the variable is removed from the environment.
+	return ::putenv(const_cast<char*>((name + "=").c_str())) == 0;
+#else
+#error No environment-unsetting function has been defined.
+#endif
+}
+
+
 } // namespace support
 } // namespace lyx