Commit Diff


commit - 086cf3a2723e2dcc8e1acf49d166e254fe22e7cf
commit + 6ac5a82eecb76ec35f3f484149ad668073a52620
blob - 7e8522515192677b67275a2b0d1e8b8bc5b64e83
blob + faf3086b6b87b2d5d3d964e9024f4f067d8c056e
--- configure.ng
+++ configure.ng
@@ -188,7 +188,7 @@ AC_CHECK_FUNCS([ \
 # Optional functions
 AC_CHECK_FUNCS_ONCE([ \
 	gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \
-	snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid])
+	snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r waitpid])
 
 # -- Configuration options --
 
blob - dac329fa7c0954b399f2298955644ebe03ff7b4a
blob + 17edbdf21b09f087e1606fc73794522f811c9ef8
--- src/portab/Makefile.ng
+++ src/portab/Makefile.ng
@@ -15,7 +15,7 @@ EXTRA_DIST = Makefile.ng
 
 noinst_LIBRARIES = libngportab.a
 
-libngportab_a_SOURCES = strdup.c strlcpy.c strtok_r.c vsnprintf.c waitpid.c
+libngportab_a_SOURCES = strdup.c strndup.c strlcpy.c strtok_r.c vsnprintf.c waitpid.c
 
 check_PROGRAMS = portabtest
 
blob - 208d3500342a1d2aba40b07a7eee0af9a4ec98c3
blob + a968a3b9bd924fbbe6e04eee47d1dc5f4f925e21
--- src/portab/portab.h
+++ src/portab/portab.h
@@ -157,6 +157,10 @@ extern size_t strlcpy PARAMS(( char *dst, const char *
 extern char * strdup PARAMS(( const char *s ));
 #endif
 
+#ifndef HAVE_STRNDUP
+extern char * strndup PARAMS((const char *s, size_t maxlen));
+#endif
+
 #ifndef HAVE_STRTOK_R
 extern char * strtok_r PARAMS((char *str, const char *delim, char **saveptr));
 #endif
blob - /dev/null
blob + d6e01c943299e9b696731b182d3893bb2686b148 (mode 644)
--- /dev/null
+++ src/portab/strndup.c
@@ -0,0 +1,37 @@
+/*
+ * ngIRCd -- The Next Generation IRC Daemon
+ */
+
+#include "portab.h"
+
+/**
+ * @file
+ * strndup() implementation. Public domain.
+ */
+
+#ifndef HAVE_STRNDUP
+
+#include "imp.h"
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "exp.h"
+
+GLOBAL char *
+strndup(const char *s, size_t maxlen)
+{
+	char *dup;
+	size_t len = strlen(s);
+
+	if (len > maxlen)
+		len = maxlen;
+	len++;
+	dup = malloc(len);
+	if (dup)
+		strlcpy(dup, s, len);
+	return dup;
+}
+
+#endif
+