Refactor String-Escape in repositoryutility

fixes #10989
Icinga · Feb 9, 2016 · 4d87c96 · 4d87c96
1 parent 14d805e
commit 4d87c96
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/lib/base/configwriter.hpp b/lib/base/configwriter.hpp
@@ -73,10 +73,9 @@ class I2_BASE_API ConfigWriter
 	static void EmitFunctionCall(std::ostream& fp, const String& name, const Array::Ptr& arguments);
 
 	static const std::vector<String>& GetKeywords(void);
+	static String EscapeIcingaString(const String& str);
 private:
 	ConfigWriter(void);
-
-	static String EscapeIcingaString(const String& str);
 };
 
 }

diff --git a/lib/cli/repositoryutility.cpp b/lib/cli/repositoryutility.cpp
@@ -22,6 +22,7 @@
 #include "base/logger.hpp"
 #include "base/application.hpp"
 #include "base/convert.hpp"
+#include "base/configwriter.hpp"
 #include "base/scriptglobal.hpp"
 #include "base/json.hpp"
 #include "base/netstring.hpp"
@@ -683,7 +684,7 @@ void RepositoryUtility::FormatChangelogEntry(std::ostream& fp, const Dictionary:
  */
 void RepositoryUtility::SerializeObject(std::ostream& fp, const String& name, const String& type, const Dictionary::Ptr& object)
 {
-	fp << "object " << type << " \"" << EscapeIcingaString(name) << "\" {\n";
+	fp << "object " << type << " \"" << ConfigWriter::EscapeIcingaString(name) << "\" {\n";
 
 	if (!object) {
 		fp << "}\n";
@@ -712,19 +713,6 @@ void RepositoryUtility::SerializeObject(std::ostream& fp, const String& name, co
 	fp << "}\n";
 }
 
-String RepositoryUtility::EscapeIcingaString(const String& str)
-{
-	String result = str;
-	boost::algorithm::replace_all(result, "\\", "\\\\");
-	boost::algorithm::replace_all(result, "\n", "\\n");
-	boost::algorithm::replace_all(result, "\t", "\\t");
-	boost::algorithm::replace_all(result, "\r", "\\r");
-	boost::algorithm::replace_all(result, "\b", "\\b");
-	boost::algorithm::replace_all(result, "\f", "\\f");
-	boost::algorithm::replace_all(result, "\"", "\\\"");
-	return result;
-}
-
 void RepositoryUtility::FormatValue(std::ostream& fp, const Value& val)
 {
 	if (val.IsObjectType<Array>()) {
@@ -733,11 +721,11 @@ void RepositoryUtility::FormatValue(std::ostream& fp, const Value& val)
 	}
 
 	if (val.IsString()) {
-		fp << "\"" << EscapeIcingaString(val) << "\"";
+		fp << "\"" << ConfigWriter::EscapeIcingaString(val) << "\"";
 		return;
 	}
 
-	fp << EscapeIcingaString(val);
+	fp << ConfigWriter::EscapeIcingaString(val);
 }
 
 void RepositoryUtility::FormatArray(std::ostream& fp, const Array::Ptr& arr)

diff --git a/lib/cli/repositoryutility.hpp b/lib/cli/repositoryutility.hpp
@@ -96,7 +96,6 @@ class I2_CLI_API RepositoryUtility
 
 	/* config print helpers */
 	static void SerializeObject(std::ostream& fp, const String& name, const String& type, const Dictionary::Ptr& object);
-	static String EscapeIcingaString(const String& str);
 	static void FormatValue(std::ostream& fp, const Value& val);
 	static void FormatArray(std::ostream& fp, const Array::Ptr& arr);