@@ -25,37 +25,6 @@

 #include <stdio.h>

 #include <string.h>

-#if defined(C_SOLARIS)

-size_t strnlen(const char *s, size_t n) __attribute__((weak));

-size_t strnlen(const char *s, size_t n)

-{

-    size_t i = 0;

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

-    return i;

-}

-

-char *strndup(const char *s, size_t n) __attribute__((weak));

-char *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

 #include <sys/types.h>

 #ifndef	_WIN32

 #include <sys/socket.h>

@@ -68,6 +37,7 @@ char *strndup(const char *s, size_t n)

 #endif

 #include "libclamav/clamav.h"

+#include "libclamav/str.h"

 #include "shared/optparser.h"

 #include "shared/output.h"

@@ -142,7 +112,7 @@ int localserver(const struct optstruct *opts)

         pos = server.sun_path + strlen(server.sun_path);

         while (pos != server.sun_path) {

             if (*pos == '/') {

-                sockdir = strndup(server.sun_path, strlen(server.sun_path) - cnt);

+                sockdir = cli_strndup(server.sun_path, strlen(server.sun_path) - cnt);

                 break;

             }

             else {

@@ -43,6 +43,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)

@@ -365,16 +365,6 @@ static const unsigned int fragsz[] = {

 };

 #endif

-#if defined(C_SOLARIS)

-size_t strnlen(const char *s, size_t n) __attribute__((weak));

-size_t strnlen(const char *s, size_t n)

-{

-    size_t i = 0;

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

-    return i;

-}

-#endif

-

 #define FRAGSBITS (sizeof(fragsz)/sizeof(fragsz[0]))

 struct MPMAP {

@@ -805,7 +795,7 @@ char *cli_mpool_strndup(mpool_t *mp, const char *s, size_t n) {

     return NULL;

   }

-  strsz = strnlen(s, n) + 1;

+  strsz = cli_strnlen(s, n) + 1;

   alloc = mpool_malloc(mp, strsz);

   if(!alloc)

     cli_errmsg("cli_mpool_strndup(): Can't allocate memory (%lu bytes).\n", (unsigned long) strsz);

@@ -725,7 +725,6 @@ void *cli_calloc(size_t nmemb, size_t size);

 void *cli_realloc(void *ptr, size_t size);

 void *cli_realloc2(void *ptr, size_t size);

 char *cli_strdup(const char *s);

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

 int cli_rmdirs(const char *dirname);

 char *cli_hashstream(FILE *fs, unsigned char *digcpy, int type);

 char *cli_hashfile(const char *filename, int type);

@@ -118,16 +118,6 @@ void cli_logg_unsetup(void)

 }

 #endif

-#if defined(C_SOLARIS)

-size_t strnlen(const char *s, size_t n) __attribute__((weak));

-size_t strnlen(const char *s, size_t n)

-{

-    size_t i = 0;

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

-    return i;

-}

-#endif

-

 uint8_t cli_debug_flag = 0;

 uint8_t cli_always_gen_section_hash = 0;

@@ -295,30 +285,6 @@ char *cli_strdup(const char *s)

     return alloc;

 }

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

-{

-        char *alloc;

-        size_t len;

-

-    if(s == NULL) {

-        cli_errmsg("cli_strndup(): s == NULL. Please report to http://bugs.clamav.net\n");

-        return NULL;

-    }

-

-    len = strnlen(s, n);

-    alloc = malloc(len+1);

-

-    if(!alloc) {

-        perror("strndup_problem");

-        cli_errmsg("cli_strndup(): Can't allocate memory (%u bytes).\n", (unsigned int) strlen(s));

-        return NULL;

-    } else

-        memcpy(alloc, s, len);

-

-    alloc[len] = '\0';

-    return alloc;

-}

-

 /* returns converted timestamp, in case of error the returned string contains at least one character */

 const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

 {

@@ -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;

@@ -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