@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -955,10 +955,9 @@ distcheck: dist

 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

 	  && am__cwd=`pwd` \

 	  && $(am__cd) $(distdir)/_build \

-	  && ../configure \

+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \

 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \

 	    $(DISTCHECK_CONFIGURE_FLAGS) \

-	    --srcdir=.. --prefix="$$dc_install_base" \

 	  && $(MAKE) $(AM_MAKEFLAGS) \

 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \

 	  && $(MAKE) $(AM_MAKEFLAGS) check \

@@ -1,4 +1,4 @@

-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-

+# generated automatically by aclocal 1.14 -*- Autoconf -*-

 # Copyright (C) 1996-2013 Free Software Foundation, Inc.

@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.14'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.14.1], [],

+m4_if([$1], [1.14], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.14.1])dnl

+[AM_AUTOMAKE_VERSION([1.14])dnl

 m4_ifndef([AC_AUTOCONF_VERSION],

   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -91,7 +91,8 @@ libclamav_internal_utils_la_SOURCES=str.c\

 				    regex/cname.h \

 				    regex/regex.h \

 				    regex/regex2.h \

-				    regex/utils.h

+				    regex/utils.h \

+					strlcat.c

 libclamav_internal_utils_la_LDFLAGS=-static @SSL_LDFLAGS@ @JSON_LDFLAGS@

 libclamav_internal_utils_la_CFLAGS=$(AM_CFLAGS)  -fPIC -DPIC @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

@@ -117,7 +118,8 @@ libclamav_internal_utils_nothreads_la_SOURCES=str.c\

 				    regex/cname.h \

 				    regex/regex.h \

 				    regex/regex2.h \

-				    regex/utils.h

+				    regex/utils.h \

+					strlcat.c

 libclamav_internal_utils_nothreads_la_LDFLAGS=-static @SSL_LDFLAGS@ @JSON_LDFLAGS@

 libclamav_internal_utils_nothreads_la_CFLAGS=$(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -353,7 +353,8 @@ am_libclamav_internal_utils_la_OBJECTS =  \

 	libclamav_internal_utils_la-regcomp.lo \

 	libclamav_internal_utils_la-regerror.lo \

 	libclamav_internal_utils_la-regexec.lo \

-	libclamav_internal_utils_la-regfree.lo

+	libclamav_internal_utils_la-regfree.lo \

+	libclamav_internal_utils_la-strlcat.lo

 libclamav_internal_utils_la_OBJECTS =  \

 	$(am_libclamav_internal_utils_la_OBJECTS)

 libclamav_internal_utils_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \

@@ -372,7 +373,8 @@ am_libclamav_internal_utils_nothreads_la_OBJECTS =  \

 	libclamav_internal_utils_nothreads_la-regcomp.lo \

 	libclamav_internal_utils_nothreads_la-regerror.lo \

 	libclamav_internal_utils_nothreads_la-regexec.lo \

-	libclamav_internal_utils_nothreads_la-regfree.lo

+	libclamav_internal_utils_nothreads_la-regfree.lo \

+	libclamav_internal_utils_nothreads_la-strlcat.lo

 libclamav_internal_utils_nothreads_la_OBJECTS =  \

 	$(am_libclamav_internal_utils_nothreads_la_OBJECTS)

 libclamav_internal_utils_nothreads_la_LINK = $(LIBTOOL) $(AM_V_lt) \

@@ -792,7 +794,8 @@ libclamav_internal_utils_la_SOURCES = str.c\

 				    regex/cname.h \

 				    regex/regex.h \

 				    regex/regex2.h \

-				    regex/utils.h

+				    regex/utils.h \

+					strlcat.c

 libclamav_internal_utils_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@

 libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS)  -fPIC -DPIC @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

@@ -817,7 +820,8 @@ libclamav_internal_utils_nothreads_la_SOURCES = str.c\

 				    regex/cname.h \

 				    regex/regex.h \

 				    regex/regex2.h \

-				    regex/utils.h

+				    regex/utils.h \

+					strlcat.c

 libclamav_internal_utils_nothreads_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@

 libclamav_internal_utils_nothreads_la_CFLAGS = $(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

@@ -1075,6 +1079,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-str.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcat.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-conv.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-crypto.Plo@am__quote@

@@ -1086,6 +1091,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcat.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zAlloc.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-7zBuf.Plo@am__quote@

@@ -2948,6 +2954,13 @@ libclamav_internal_utils_la-regfree.lo: regex/regfree.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c

+libclamav_internal_utils_la-strlcat.lo: strlcat.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-strlcat.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-strlcat.Tpo -c -o libclamav_internal_utils_la-strlcat.lo `test -f 'strlcat.c' || echo '$(srcdir)/'`strlcat.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-strlcat.Tpo $(DEPDIR)/libclamav_internal_utils_la-strlcat.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='strlcat.c' object='libclamav_internal_utils_la-strlcat.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-strlcat.lo `test -f 'strlcat.c' || echo '$(srcdir)/'`strlcat.c

+

 libclamav_internal_utils_nothreads_la-str.lo: str.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-str.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Tpo -c -o libclamav_internal_utils_nothreads_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Plo

@@ -3025,6 +3038,13 @@ libclamav_internal_utils_nothreads_la-regfree.lo: regex/regfree.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c

+libclamav_internal_utils_nothreads_la-strlcat.lo: strlcat.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-strlcat.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcat.Tpo -c -o libclamav_internal_utils_nothreads_la-strlcat.lo `test -f 'strlcat.c' || echo '$(srcdir)/'`strlcat.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcat.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcat.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='strlcat.c' object='libclamav_internal_utils_nothreads_la-strlcat.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-strlcat.lo `test -f 'strlcat.c' || echo '$(srcdir)/'`strlcat.c

+

 libclamav_nocxx_la-bytecode_nojit.lo: bytecode_nojit.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_nocxx_la_CFLAGS) $(CFLAGS) -MT libclamav_nocxx_la-bytecode_nojit.lo -MD -MP -MF $(DEPDIR)/libclamav_nocxx_la-bytecode_nojit.Tpo -c -o libclamav_nocxx_la-bytecode_nojit.lo `test -f 'bytecode_nojit.c' || echo '$(srcdir)/'`bytecode_nojit.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_nocxx_la-bytecode_nojit.Tpo $(DEPDIR)/libclamav_nocxx_la-bytecode_nojit.Plo

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -5653,10 +5653,9 @@ distcheck: dist

 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

 	  && am__cwd=`pwd` \

 	  && $(am__cd) $(distdir)/_build \

-	  && ../configure \

+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \

 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \

 	    $(DISTCHECK_CONFIGURE_FLAGS) \

-	    --srcdir=.. --prefix="$$dc_install_base" \

 	  && $(MAKE) $(AM_MAKEFLAGS) \

 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \

 	  && $(MAKE) $(AM_MAKEFLAGS) check \

@@ -5746,8 +5745,8 @@ maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)

-@BUILD_EXTERNAL_LLVM_TRUE@clean-local:

 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:

 clean: clean-am

 clean-am: clean-generic clean-libtool clean-local \

@@ -1,4 +1,4 @@

-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-

+# generated automatically by aclocal 1.14 -*- Autoconf -*-

 # Copyright (C) 1996-2013 Free Software Foundation, Inc.

@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.14'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.14.1], [],

+m4_if([$1], [1.14], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.14.1])dnl

+[AM_AUTOMAKE_VERSION([1.14])dnl

 m4_ifndef([AC_AUTOCONF_VERSION],

   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@@ -66,6 +66,8 @@ CLAMAV_PRIVATE {

     cli_gettmpdir;

     cli_strtok;

     cli_strtokenize;

+    cli_strlcat;

+    cli_strlcpy;

     cli_cvdunpack;

     cli_regcomp;

     cli_regexec;

@@ -16,6 +16,10 @@

  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

 #include <sys/types.h>

 #include <string.h>

@@ -28,6 +32,9 @@

 size_t

 cli_strlcpy(char *dst, const char *src, size_t siz)

 {

+#if HAVE_STRLCPY

+    return strlcpy(dst, src, siz);

+#else

 	char *d = dst;

 	const char *s = src;

 	size_t n = siz;

@@ -49,4 +56,5 @@ cli_strlcpy(char *dst, const char *src, size_t siz)

 	}

 	return(s - src - 1);	/* count does not include NUL */

+#endif

 }

@@ -58,4 +58,5 @@ typedef enum {

 } utf16_type;

 char *cli_utf16_to_utf8(const char *utf16, size_t length, utf16_type type);

+size_t cli_strlcat(char *dst, const char *src, size_t sz); /* libclamav/strlcat.c */

 #endif

new file mode 100644

@@ -0,0 +1,67 @@

+/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/

+

+/*

+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>

+ *

+ * 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.

+ */

+

+/*

+ * Taken from HardenedBSD's strlcat.c, which was taken from OpenBSD.

+ */

+

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#include <sys/types.h>

+#include <string.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

+cli_strlcat(char *dst, const char *src, size_t siz)

+{

+#if HAVE_STRLCAT

+    return strlcat(dst, src, siz);

+#else

+	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 */

+#endif

+}

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.14.1 from Makefile.am.

+# Makefile.in generated by automake 1.14 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994-2013 Free Software Foundation, Inc.