5 files changed, 69 insertions, 12 deletions
diff --git a/libdevcore/Common.h b/libdevcore/Common.h
index 2543855d..0363d9a2 100644
--- a/libdevcore/Common.h
+++ b/libdevcore/Common.h
@@ -40,7 +40,6 @@
 #include <libdevcore/vector_ref.h>
 
 #if defined(__GNUC__)
-#pragma warning(push)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif // defined(__GNUC__)
@@ -57,7 +56,6 @@
 #include <boost/multiprecision/cpp_int.hpp>
 
 #if defined(__GNUC__)
-#pragma warning(pop)
 #pragma GCC diagnostic pop
 #endif // defined(__GNUC__)
 
diff --git a/libdevcore/CommonIO.cpp b/libdevcore/CommonIO.cpp
index 0063a8d4..9693d02a 100644
--- a/libdevcore/CommonIO.cpp
+++ b/libdevcore/CommonIO.cpp
@@ -187,3 +187,23 @@ boost::filesystem::path dev::weaklyCanonicalFilesystemPath(boost::filesystem::pa
 		return head / tail;
 	}
 }
+
+string dev::absolutePath(string const& _path, string const& _reference)
+{
+	boost::filesystem::path p(_path);
+	// Anything that does not start with `.` is an absolute path.
+	if (p.begin() == p.end() || (*p.begin() != "." && *p.begin() != ".."))
+		return _path;
+	boost::filesystem::path result(_reference);
+	result.remove_filename();
+	for (boost::filesystem::path::iterator it = p.begin(); it != p.end(); ++it)
+		if (*it == "..")
+			result = result.parent_path();
+		else if (*it != ".")
+			result /= *it;
+	return result.generic_string();
+}
+
+string dev::sanitizePath(string const& _path) {
+	return boost::filesystem::path(_path).generic_string();
+}
diff --git a/libdevcore/CommonIO.h b/libdevcore/CommonIO.h
index 9ba68e74..928b6d15 100644
--- a/libdevcore/CommonIO.h
+++ b/libdevcore/CommonIO.h
@@ -62,4 +62,10 @@ std::string toString(_T const& _t)
 /// Should be replaced by the boost implementation as soon as support for boost<1.60 can be dropped.
 boost::filesystem::path weaklyCanonicalFilesystemPath(boost::filesystem::path const &_path);
 
+/// @returns the absolute path corresponding to @a _path relative to @a _reference.
+std::string absolutePath(std::string const& _path, std::string const& _reference);
+
+/// Helper function to return path converted strings.
+std::string sanitizePath(std::string const& _path);
+
 }
diff --git a/libdevcore/StringUtils.cpp b/libdevcore/StringUtils.cpp
index 2ff86bd5..01bdc675 100644
--- a/libdevcore/StringUtils.cpp
+++ b/libdevcore/StringUtils.cpp
@@ -85,17 +85,11 @@ size_t dev::stringDistance(string const& _str1, string const& _str2)
 
 string dev::quotedAlternativesList(vector<string> const& suggestions)
 {
-	if (suggestions.empty())
-		return "";
-	if (suggestions.size() == 1)
-		return "\"" + suggestions.front() + "\"";
+	vector<string> quotedSuggestions;
 
-	string choices = "\"" + suggestions.front() + "\"";
-	for (size_t i = 1; i + 1 < suggestions.size(); ++i)
-		choices += ", \"" + suggestions[i] + "\"";
+	for (auto& suggestion: suggestions)
+		quotedSuggestions.push_back("\"" + suggestion + "\"");
 
-	choices += " or \"" + suggestions.back() + "\"";
-
-	return choices;
+	return joinHumanReadable(quotedSuggestions, ", ", " or ");
 }
 
diff --git a/libdevcore/StringUtils.h b/libdevcore/StringUtils.h
index acd93e32..4fb5a748 100644
--- a/libdevcore/StringUtils.h
+++ b/libdevcore/StringUtils.h
@@ -36,4 +36,43 @@ size_t stringDistance(std::string const& _str1, std::string const& _str2);
 // Return a string having elements of suggestions as quoted, alternative suggestions. e.g. "a", "b" or "c"
 std::string quotedAlternativesList(std::vector<std::string> const& suggestions);
 
+/// Joins collection of strings into one string with separators between, last separator can be different.
+/// @param _list collection of strings to join
+/// @param _separator defaults to ", "
+/// @param _lastSeparator (optional) will be used to separate last two strings instead of _separator
+/// @example join(vector<string>{"a", "b", "c"}, "; ", " or ") == "a; b or c"
+template<class T>
+std::string joinHumanReadable
+(
+	T const& _list,
+	std::string const& _separator = ", ",
+	std::string const& _lastSeparator = ""
+)
+{
+	auto it = begin(_list);
+	auto itEnd = end(_list);
+
+	std::string result;
+
+	// append first string
+	if (it != itEnd)
+	{
+		result += *it;
+		++it;
+	}
+
+	for (;it != itEnd; ++it)
+	{
+		if ((next(it) == itEnd) && !_lastSeparator.empty())
+			result += _lastSeparator; // last iteration
+		else
+			result += _separator;
+
+		// append string
+		result += *it;
+	}
+
+	return result;
+}
+
 }