Module: ngircd.git Branch: master Commit: 6ac5a82eecb76ec35f3f484149ad668073a52620 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6ac5a82ee... Author: Federico G. Schwindt <fgsch@lodoss.net> Date: Mon Aug 26 10:47:04 2013 +0100 private strndup() implementation in case libc does not provide it --- configure.ng | 2 +- src/portab/Makefile.ng | 2 +- src/portab/portab.h | 4 ++++ src/portab/strndup.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/configure.ng b/configure.ng index 7e85225..faf3086 100644 --- 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 index dac329f..17edbdf 100644 --- 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 index 208d350..a968a3b 100644 --- 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 0000000..d6e01c9 --- /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 <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 +