@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2009 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm

@@ -37,6 +37,7 @@

 #endif

 #include "libclamav/clamav.h"

+#include "libclamav/str.h"

 #include "shared/optparser.h"

 #include "shared/output.h"

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2015 Sourcefire, Inc.

  *

  *  Authors: Mickey Sola

@@ -44,6 +44,7 @@

 #include "libclamav/clamav.h"

 #include "libclamav/scanners.h"

+#include "libclamav/str.h"

 #include "shared/optparser.h"

 #include "shared/output.h"

@@ -438,7 +439,7 @@ static int onas_add_hashnode_child(struct onas_hnode *node, const char* dirname)

 	if (!child) return CL_EMEM;

 	size_t n = strlen(dirname);

-	child->dirname = strndup(dirname, n);

+	child->dirname = cli_strndup(dirname, n);

 	onas_add_listnode(node->childtail, child);

@@ -500,7 +501,7 @@ inline static char *onas_get_parent(const char *pathname, size_t len) {

 		idx++;

 	}

-	ret = strndup(pathname, idx);

+	ret = cli_strndup(pathname, idx);

 	if (!ret) {

 		errno = ENOMEM;

 		return NULL;

@@ -596,7 +597,7 @@ int onas_ht_add_hierarchy(struct onas_ht *ht, const char *pathname) {

 				if (!hnode) return CL_EMEM;

 				hnode->pathlen = curr->fts_pathlen;

-				hnode->pathname = strndup(curr->fts_path, hnode->pathlen);

+				hnode->pathname = cli_strndup(curr->fts_path, hnode->pathlen);

 				hnode->prnt_pathname = onas_get_parent(hnode->pathname, hnode->pathlen);

 				if (hnode->prnt_pathname)

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2008 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm, Nigel Horne, Török Edvin

@@ -460,6 +460,38 @@ const char* cli_strcasestr(const char* a, const char *b)

 }

 #endif

+#ifndef HAVE_STRNLEN

+size_t cli_strnlen(const char *s, size_t n)

+{

+    size_t i = 0;

+    for(; (i < n) && s[i] != '\0'; ++i);

+    return i;

+}

+#endif

+

+#ifndef HAVE_STRNDUP

+char *cli_strndup(const char *s, size_t n)

+{

+    char *alloc;

+    size_t len;

+

+    if(!s) {

+        return NULL;

+    }

+

+    len = strnlen(s, n);

+    alloc = malloc(len+1);

+

+    if(!alloc) {

+        return NULL;

+    } else

+        memcpy(alloc, s, len);

+

+    alloc[len] = '\0';

+    return alloc;

+}

+#endif

+

 size_t cli_strtokenize(char *buffer, const char delim, const size_t token_count, const char **tokens)

 {

 	size_t tokens_found, i;

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2008 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm, Nigel Horne, Török Edvin

@@ -33,6 +33,18 @@

 const char *cli_strcasestr(const char *haystack, const char *needle);

 #endif

+#ifdef HAVE_STRNDUP

+#define cli_strndup strndup

+#else

+char *cli_strndup(const char *s, size_t n);

+#endif

+

+#ifdef HAVE_STRNLEN

+#define cli_strnlen strnlen

+#else

+size_t cli_strnlen(const char *s, size_t n);

+#endif

+

 #include <stdio.h>

 #define cli_nocase(val) tolower(val)

 #define cli_nocasei(val) toupper(val)

@@ -2,7 +2,9 @@ AX_CHECK_UNAME_SYSCALL

 AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])

 AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])

-AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo])

+AC_CHECK_FUNCS_ONCE([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise getnameinfo])

+AC_CHECK_FUNCS([strndup])

+AC_CHECK_FUNCS([strnlen])

 AC_FUNC_FSEEKO

 dnl Check if anon maps are available, check if we can determine the page size