From: des Date: Tue, 4 Apr 2006 10:07:40 +0000 (+0000) Subject: Add a libcompat with strlcat() and strlcpy() from OpenBSD. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4a34ca1f636574d76106b6b847a24e5400073d5;p=varnish Add a libcompat with strlcat() and strlcpy() from OpenBSD. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@113 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac index 231ea1d3..33148721 100644 --- a/varnish-cache/configure.ac +++ b/varnish-cache/configure.ac @@ -60,6 +60,10 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS([strerror]) AC_FUNC_STRERROR_R AC_CHECK_FUNCS([socket]) +AC_CHECK_FUNCS([strlcat]) +AM_CONDITIONAL(HAVE_STRLCAT, test x$ac_strlcat = xtrue) +AC_CHECK_FUNCS([strlcpy]) +AM_CONDITIONAL(HAVE_STRLCPY, test x$ac_strlcpy = xtrue) AC_CONFIG_FILES([ Makefile @@ -69,6 +73,7 @@ AC_CONFIG_FILES([ contrib/Makefile include/Makefile lib/Makefile + lib/libcompat/Makefile lib/libsbuf/Makefile lib/libvarnish/Makefile lib/libvarnishapi/Makefile diff --git a/varnish-cache/include/Makefile.am b/varnish-cache/include/Makefile.am index 57aaabb9..b863ca77 100644 --- a/varnish-cache/include/Makefile.am +++ b/varnish-cache/include/Makefile.am @@ -1,6 +1,7 @@ # $Id$ include_HEADERS = \ + compat.h \ hash.h \ libvarnish.h \ queue.h \ diff --git a/varnish-cache/include/compat.h b/varnish-cache/include/compat.h new file mode 100644 index 00000000..d18e7bf7 --- /dev/null +++ b/varnish-cache/include/compat.h @@ -0,0 +1,16 @@ +/* + * $Id$ + */ + +#ifndef COMPAT_H_INCLUDED +#define COMPAT_H_INCLUDED + +#ifndef HAVE_STRLCPY +size_t strlcpy(char *dst, const char *src, size_t size); +#endif + +#ifndef HAVE_STRLCAT +size_t strlcat(char *dst, const char *src, size_t size); +#endif + +#endif diff --git a/varnish-cache/lib/Makefile.am b/varnish-cache/lib/Makefile.am index 8b8ece51..cf13ceb9 100644 --- a/varnish-cache/lib/Makefile.am +++ b/varnish-cache/lib/Makefile.am @@ -1,6 +1,7 @@ # $Id$ SUBDIRS = \ + libcompat \ libsbuf \ libvarnish \ libvarnishapi \ diff --git a/varnish-cache/lib/libcompat/Makefile.am b/varnish-cache/lib/libcompat/Makefile.am new file mode 100644 index 00000000..349c0b7d --- /dev/null +++ b/varnish-cache/lib/libcompat/Makefile.am @@ -0,0 +1,15 @@ +# $Id$ + +INCLUDES = -I$(top_srcdir)/include + +lib_LIBRARIES = libcompat.a + +libcompat_a_SOURCES = + +if !HAVE_STRLCAT +libcompat_a_SOURCES += strlcat.c +endif + +if !HAVE_STRLCPY +libcompat_a_SOURCES += strlcpy.c +endif diff --git a/varnish-cache/lib/libcompat/strlcat.c b/varnish-cache/lib/libcompat/strlcat.c new file mode 100644 index 00000000..d4003c82 --- /dev/null +++ b/varnish-cache/lib/libcompat/strlcat.c @@ -0,0 +1,59 @@ +/* $Id$ */ +/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ + +/* + * Copyright (c) 1998 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +#include "config.h" +#include "compat.h" + +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +size_t +strlcat(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + + if (n == 0) + return(dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + return(dlen + (s - src)); /* count does not include NUL */ +} diff --git a/varnish-cache/lib/libcompat/strlcpy.c b/varnish-cache/lib/libcompat/strlcpy.c new file mode 100644 index 00000000..963dd5ab --- /dev/null +++ b/varnish-cache/lib/libcompat/strlcpy.c @@ -0,0 +1,55 @@ +/* $Id$ */ +/* $OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */ + +/* + * Copyright (c) 1998 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +#include "config.h" +#include "compat.h" + +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t +strlcpy(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + + /* Copy as many bytes as will fit */ + if (n != 0 && --n != 0) { + do { + if ((*d++ = *s++) == 0) + break; + } while (--n != 0); + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ +}