3 files changed, 48 insertions, 0 deletions
diff --git a/src/decoder/OpusReader.hxx b/src/decoder/OpusReader.hxx
index 2cfc14118..1fd07b55c 100644
--- a/src/decoder/OpusReader.hxx
+++ b/src/decoder/OpusReader.hxx
@@ -21,6 +21,7 @@
 #define MPD_OPUS_READER_HXX
 
 #include "check.h"
+#include "string_util.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/src/string_util.c b/src/string_util.c
index 6e5429076..b76b257ba 100644
--- a/src/string_util.c
+++ b/src/string_util.c
@@ -20,6 +20,8 @@
 #include "config.h"
 #include "string_util.h"
 
+#include <stdlib.h> /* for malloc() */
+#include <string.h> /* for strnlen() */
 #include <glib.h>
 
 #include <assert.h>
@@ -45,3 +47,22 @@ string_array_contains(const char *const* haystack, const char *needle)
 
 	return false;
 }
+
+#if !defined(HAVE_STRNDUP)
+
+char *
+strndup(const char *str, size_t n)
+{
+	assert(str != NULL);
+
+	size_t len = strnlen(str, n);
+	char* ret = (char *) malloc(len + 1);
+	if (ret == NULL)
+		return NULL;
+
+	memcpy(ret, str, len);
+	ret[len] = '\0';
+	return ret;
+}
+
+#endif
diff --git a/src/string_util.h b/src/string_util.h
index c1d316f0c..374fd0f91 100644
--- a/src/string_util.h
+++ b/src/string_util.h
@@ -23,6 +23,11 @@
 #include "gcc.h"
 
 #include <stdbool.h>
+#include <stdlib.h> /* for size_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * Remove the "const" attribute from a string pointer.  This is a
@@ -78,4 +83,25 @@ strchug_fast(char *p)
 bool
 string_array_contains(const char *const* haystack, const char *needle);
 
+#if !defined(HAVE_STRNDUP)
+
+/**
+ * Duplicates the string to a newly allocated buffer
+ * copying at most n characters.
+ *
+ * @param str a string to duplicate
+ * @param n maximal number of characters to copy
+ * @return a pointer to the duplicated string,
+ * or NULL if memory allocation failed.
+ */
+gcc_malloc
+char *
+strndup(const char *str, size_t n);
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif 
+
 #endif