FORMAT for format 594

[lyx.git] / src / support / environment.cpp

diff --git a/src/support/environment.cpp b/src/support/environment.cpp
index 813d418d9a9dcd2f8c418371ca6332bfbca92603..246e6afce235269b4a25e851ef835503fa7f057d 100644 (file)
--- a/src/support/environment.cpp
+++ b/src/support/environment.cpp
@@ -15,10 +15,11 @@
 #include "support/environment.h"
 
 #include "support/docstring.h"
+#include "support/lstrings.h"
 #include "support/os.h"
+#include "support/debug.h"
 
-#include <boost/tokenizer.hpp>
-
+#include <algorithm> // for remove
 #include <cstdlib>
 #include <map>
 #include <sstream>
@@ -45,20 +46,10 @@ string const getEnv(string const & name)
 
 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());
 
-       vector<string> vars;
-       for (; it != end; ++it)
-               vars.push_back(os::internal_path(*it));
-
-       return vars;
+       return getVectorFromString(env_var, separator);
 }
 
 
@@ -67,7 +58,13 @@ bool setEnv(string const & name, string const & value)
        // CHECK Look at and fix this.
        // f.ex. what about error checking?
 
-       string const encoded = to_local8bit(from_utf8(value));
+       string encoded;
+       try {
+               encoded = to_local8bit(from_utf8(value));
+       } catch (...) {
+               return false;
+       }
+
 #if defined (HAVE_SETENV)
        return ::setenv(name.c_str(), encoded.c_str(), 1) == 0;
 #elif defined (HAVE_PUTENV)
@@ -75,6 +72,7 @@ bool setEnv(string const & name, string const & value)
        // 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(const_cast<char*>(varmap[name].c_str())) == 0;
@@ -103,18 +101,14 @@ 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());
-
+       LYXERR(Debug::INIT, "Prepending \"" << prefix << "\" to PATH");
        typedef vector<string>::const_reverse_iterator token_iterator;
        token_iterator it = reversed_tokens.rbegin();
        token_iterator const end = reversed_tokens.rend();