1 files changed, 85 insertions, 1 deletions
diff --git a/src/util/Alloc.cxx b/src/util/Alloc.cxx
index 006e09701..c2676ca3d 100644
--- a/src/util/Alloc.cxx
+++ b/src/util/Alloc.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -75,3 +75,87 @@ xstrndup(const char *s, size_t n)
 
 	return p;
 }
+
+#if CLANG_OR_GCC_VERSION(4,7)
+
+template<typename... Args>
+static inline size_t
+FillLengths(size_t *lengths, const char *a, Args&&... args)
+{
+	return FillLengths(lengths, a) + FillLengths(lengths + 1, args...);
+}
+
+template<>
+inline size_t
+FillLengths(size_t *lengths, const char *a)
+{
+	return *lengths = strlen(a);
+}
+
+template<typename... Args>
+static inline void
+StringCat(char *p, const size_t *lengths, const char *a, Args&&... args)
+{
+	StringCat(p, lengths, a);
+	StringCat(p + *lengths, lengths + 1, args...);
+}
+
+template<>
+inline void
+StringCat(char *p, const size_t *lengths, const char *a)
+{
+	memcpy(p, a, *lengths);
+}
+
+#endif
+
+template<typename... Args>
+gcc_malloc gcc_nonnull_all
+static inline char *
+t_xstrcatdup(Args&&... args)
+{
+#if CLANG_OR_GCC_VERSION(4,7)
+	constexpr size_t n = sizeof...(args);
+
+	size_t lengths[n];
+	const size_t total = FillLengths(lengths, args...);
+
+	char *p = (char *)xalloc(total + 1);
+	StringCat(p, lengths, args...);
+	p[total] = 0;
+	return p;
+#else
+	/* fallback implementation for gcc 4.6, because that old
+	   compiler is too buggy to compile the above template
+	   functions */
+	const char *const argv[] = { args... };
+
+	size_t total = 0;
+	for (auto i : argv)
+		total += strlen(i);
+
+	char *p = (char *)xalloc(total + 1), *q = p;
+	for (auto i : argv)
+		q = stpcpy(q, i);
+
+	return p;
+#endif
+}
+
+char *
+xstrcatdup(const char *a, const char *b)
+{
+	return t_xstrcatdup(a, b);
+}
+
+char *
+xstrcatdup(const char *a, const char *b, const char *c)
+{
+	return t_xstrcatdup(a, b, c);
+}
+
+char *
+xstrcatdup(const char *a, const char *b, const char *c, const char *d)
+{
+	return t_xstrcatdup(a, b, c, d);
+}