repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 6ac5a82eecb76ec35f3f484149ad668073a52620:
path_to: 
revision_to: 

commit 6ac5a82eecb76ec35f3f484149ad668073a52620
Author: Federico G. Schwindt 
Date:   Mon Aug 26 10:47:04 2013 +0100

    private strndup() implementation in case libc does not provide it

diff --git a/configure.ng b/configure.ng

--- a/configure.ng
+++ b/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 --

diff --git a/src/portab/Makefile.ng b/src/portab/Makefile.ng

--- a/src/portab/Makefile.ng
+++ b/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

diff --git a/src/portab/portab.h b/src/portab/portab.h

--- a/src/portab/portab.h
+++ b/src/portab/portab.h
@@ -157,6 +157,10 @@ extern size_t strlcpy PARAMS(( char *dst, const char *src, size_t size ));
 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
diff --git a/src/portab/strndup.c b/src/portab/strndup.c
new file mode 100644
index 0000000000000000000000000000000000000000..d6e01c943299e9b696731b182d3893bb2686b148
--- /dev/null
+++ b/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 
+#include 
+#include 
+
+#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
+

-----END OF PAGE-----