util/AllocatedString: add methods Duplicate(), Clone()

3 files changed, 60 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index cae777814..121d2922c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,7 +378,7 @@ libutil_a_SOURCES = \
 	src/util/CharUtil.hxx \
 	src/util/NumberParser.hxx \
 	src/util/StringPointer.hxx \
-	src/util/AllocatedString.hxx \
+	src/util/AllocatedString.cxx src/util/AllocatedString.hxx \
 	src/util/StringUtil.cxx src/util/StringUtil.hxx \
 	src/util/WStringUtil.cxx src/util/WStringUtil.hxx \
 	src/util/StringAPI.hxx \
diff --git a/src/util/AllocatedString.cxx b/src/util/AllocatedString.cxx
new file mode 100644
index 000000000..486462fa4
--- /dev/null
+++ b/src/util/AllocatedString.cxx
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2015 Max Kellermann <max@duempel.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "AllocatedString.hxx"
+#include "StringAPI.hxx"
+
+template<>
+AllocatedString<char>
+AllocatedString<char>::Duplicate(const_pointer src)
+{
+	return Duplicate(src, StringLength(src));
+}
diff --git a/src/util/AllocatedString.hxx b/src/util/AllocatedString.hxx
index 97975f8b8..c1d844426 100644
--- a/src/util/AllocatedString.hxx
+++ b/src/util/AllocatedString.hxx
@@ -33,6 +33,7 @@
 #include "StringPointer.hxx"
 
 #include <utility>
+#include <algorithm>
 
 /**
  * A string pointer whose memory is managed by this class.
@@ -76,6 +77,22 @@ public:
 		return Donate(p);
 	}
 
+	static AllocatedString Duplicate(const_pointer src);
+
+	static AllocatedString Duplicate(const_pointer begin,
+					 const_pointer end) {
+		auto p = new value_type[end - begin + 1];
+		*std::copy(begin, end, p) = 0;
+		return Donate(p);
+	}
+
+	static AllocatedString Duplicate(const_pointer begin,
+					 size_t length) {
+		auto p = new value_type[length];
+		*std::copy_n(begin, length, p) = 0;
+		return Donate(p);
+	}
+
 	AllocatedString &operator=(AllocatedString &&src) {
 		std::swap(value, src.value);
 		return *this;
@@ -98,6 +115,10 @@ public:
 		value = nullptr;
 		return result;
 	}
+
+	AllocatedString Clone() const {
+		return Duplicate(c_str());
+	}
 };
 
 #endif