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

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

         while (pos != server.sun_path) {

             if (*pos == '/') {

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

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

                 break;

             } else {

                 pos--;

@@ -506,7 +506,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 = cli_strndup(dirname, n);

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

     onas_add_listnode(node->childtail, child);

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

         idx++;

     }

-    ret = cli_strndup(pathname, idx);

+    ret = CLI_STRNDUP(pathname, idx);

     if (!ret) {

         errno = ENOMEM;

         return NULL;

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

                 }

                 hnode->pathlen  = curr->fts_pathlen;

-                hnode->pathname = cli_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)

@@ -897,7 +897,7 @@ static cl_error_t egg_parse_comment_header(const uint8_t* index, size_t size, ex

         }

     } else {

         /* Should already be UTF-8. Use as-is.. */

-        comment_utf8 = cli_strndup((char*)index, size);

+        comment_utf8 = CLI_STRNDUP((char*)index, size);

         if (NULL == comment_utf8) {

             cli_dbgmsg("egg_parse_comment_header: failed to allocate comment buffer.\n");

             status = CL_EMEM;

@@ -1453,7 +1453,7 @@ static cl_error_t egg_parse_file_extra_field(egg_handle* handle, egg_file* eggFi

                 }

             } else {

                 /* Should already be UTF-8. Use as-is.. */

-                name_utf8 = cli_strndup((char*)index, name_size);

+                name_utf8 = CLI_STRNDUP((char*)index, name_size);

                 if (NULL == name_utf8) {

                     cli_dbgmsg("egg_parse_file_extra_field: failed to allocate name buffer.\n");

                     status = CL_EMEM;

@@ -257,6 +257,11 @@ CLAMAV_PRIVATE {

     cl_base64_decode;

     cl_base64_encode;

     cli_sanitize_filepath;

+

+    __cli_strcasestr;

+    __cli_strndup;

+    __cli_strnlen;

+    __cli_strnstr;

   local:

     *;

 };

@@ -284,13 +284,13 @@ static int cli_ac_addpatt_recursive(struct cli_matcher *root, struct cli_ac_patt

      * it's why this function was re-written to be recursive

      */

     if ((pattern->sigopts & ACPATT_OPTION_NOCASE) && isalpha(pattern->pattern[i] & 0xff)) {

-        next = pt->trans[cli_nocasei((unsigned char)(pattern->pattern[i] & 0xff))];

+        next = pt->trans[CLI_NOCASEI((unsigned char)(pattern->pattern[i] & 0xff))];

         if (!next)

             next = add_new_node(root, i, len);

         if (!next)

             return CL_EMEM;

         else

-            pt->trans[cli_nocasei((unsigned char)(pattern->pattern[i] & 0xff))] = next;

+            pt->trans[CLI_NOCASEI((unsigned char)(pattern->pattern[i] & 0xff))] = next;

         if ((ret = cli_ac_addpatt_recursive(root, pattern, next, i + 1, len)) != CL_SUCCESS)

             return ret;

@@ -878,7 +878,7 @@ static int ac_forward_match_branch(const unsigned char *buffer, uint32_t bp, uin

             break;                                                   \

                                                                      \

         case CLI_MATCH_NOCASE:                                       \

-            if ((unsigned char)(p & 0xff) != cli_nocase(b))          \

+            if ((unsigned char)(p & 0xff) != CLI_NOCASE(b))          \

                 match = 0;                                           \

             break;                                                   \

                                                                      \

@@ -909,7 +909,7 @@ static int ac_forward_match_branch(const unsigned char *buffer, uint32_t bp, uin

             break;                                                                            \

                                                                                               \

         case CLI_MATCH_NOCASE:                                                                \

-            if ((unsigned char)(p & 0xff) != cli_nocase(b))                                   \

+            if ((unsigned char)(p & 0xff) != CLI_NOCASE(b))                                   \

                 match = 0;                                                                    \

             break;                                                                            \

                                                                                               \

@@ -2164,7 +2164,7 @@ inline static int ac_addspecial_add_alt_node(const char *subexpr, uint8_t sigopt

     if (sigopts & ACPATT_OPTION_NOCASE) {

         for (i = 0; i < newnode->len; ++i)

             if ((newnode->str[i] & CLI_MATCH_METADATA) == CLI_MATCH_CHAR) {

-                newnode->str[i] = cli_nocase(newnode->str[i] & 0xff);

+                newnode->str[i] = CLI_NOCASE(newnode->str[i] & 0xff);

                 newnode->str[i] += CLI_MATCH_NOCASE;

             }

     }

@@ -2497,7 +2497,7 @@ cl_error_t cli_ac_addsig(struct cli_matcher *root, const char *virname, const ch

                 }

                 if ((sigopts & ACPATT_OPTION_NOCASE) && ((*dec & CLI_MATCH_METADATA) == CLI_MATCH_CHAR))

-                    new->ch[i] = cli_nocase(*dec) | CLI_MATCH_NOCASE;

+                    new->ch[i] = CLI_NOCASE(*dec) | CLI_MATCH_NOCASE;

                 else

                     new->ch[i] = *dec;

                 free(dec);

@@ -2513,7 +2513,7 @@ cl_error_t cli_ac_addsig(struct cli_matcher *root, const char *virname, const ch

                 }

                 if ((sigopts & ACPATT_OPTION_NOCASE) && ((*dec & CLI_MATCH_METADATA) == CLI_MATCH_CHAR))

-                    new->ch[i] = cli_nocase(*dec) | CLI_MATCH_NOCASE;

+                    new->ch[i] = CLI_NOCASE(*dec) | CLI_MATCH_NOCASE;

                 else

                     new->ch[i] = *dec;

                 free(dec);

@@ -2717,7 +2717,7 @@ cl_error_t cli_ac_addsig(struct cli_matcher *root, const char *virname, const ch

     if (sigopts & ACPATT_OPTION_NOCASE) {

         for (i = 0; i < new->length[0]; i++)

             if ((new->pattern[i] & CLI_MATCH_METADATA) == CLI_MATCH_CHAR) {

-                new->pattern[i] = cli_nocase(new->pattern[i] & 0xff);

+                new->pattern[i] = CLI_NOCASE(new->pattern[i] & 0xff);

                 new->pattern[i] += CLI_MATCH_NOCASE;

             }

     }

@@ -141,7 +141,7 @@ cl_error_t cli_bcomp_addpatt(struct cli_matcher *root, const char *virname, cons

     }

     /* make a working copy of the param buffer */

-    buf = cli_strndup(buf_start, len);

+    buf = CLI_STRNDUP(buf_start, len);

     /* break up the new param buffer into its component strings and verify we have exactly 3 */

     toks = cli_strtokenize(buf, '#', 3 + 1, tokens);

@@ -2220,7 +2220,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 					 * Don't bother with text/plain or

 					 * text/html

 					 */

-                    if (cli_strcasestr(s, "text/plain") != NULL)

+                    if (CLI_STRCASESTR(s, "text/plain") != NULL)

                         /*

 						 * Don't bother to save the

 						 * unuseful part, read past

@@ -2230,7 +2230,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 						 */

                         continue;

                     if ((!doPhishingScan) &&

-                        (cli_strcasestr(s, "text/html") != NULL))

+                        (CLI_STRCASESTR(s, "text/html") != NULL))

                         continue;

                     break;

                 }

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

         return NULL;

     }

-    strsz = cli_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);

@@ -933,7 +933,7 @@ char *cli_sanitize_filepath(const char *filepath, size_t filepath_len)

              * Is not "/", "./", or "../".

              */

             /* Find the next path separator. */

-            next_pathsep = cli_strnstr(filepath + index, PATHSEP, filepath_len - index);

+            next_pathsep = CLI_STRNSTR(filepath + index, PATHSEP, filepath_len - index);

             if (NULL == next_pathsep) {

                 /* No more path separators, copy the rest (filename) into the sanitized path */

                 strncpy(sanitized_filepath + sanitized_index, filepath + index, filepath_len - index);

@@ -1128,7 +1128,7 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char **filepath)

     /* Success. Add null terminator */

     fname[linksz] = '\0';

-    *filepath = cli_strndup(fname, cli_strnlen(fname, PATH_MAX));

+    *filepath = CLI_STRNDUP(fname, CLI_STRNLEN(fname, PATH_MAX));

     if (NULL == *filepath) {

         cli_errmsg("cli_get_filepath_from_filedesc: Failed to allocate memory to store filename\n");

         status = CL_EMEM;

@@ -1145,7 +1145,7 @@ cl_error_t cli_get_filepath_from_filedesc(int desc, char **filepath)

         goto done;

     }

-    *filepath = cli_strndup(fname, cli_strnlen(fname, PATH_MAX));

+    *filepath = CLI_STRNDUP(fname, CLI_STRNLEN(fname, PATH_MAX));

     if (NULL == *filepath) {

         cli_errmsg("cli_get_filepath_from_filedesc: Failed to allocate memory to store filename\n");

         status = CL_EMEM;

@@ -2348,7 +2348,7 @@ static inline int hash_impfns(cli_ctx *ctx, void **hashctx, uint32_t *impsz, str

                 if (!ret) {

                     /* Hint field is a uint16_t and precedes the Name field */

                     if ((buffer = fmap_need_off_once(map, offset + sizeof(uint16_t), MIN(PE_MAXNAMESIZE, fsize - offset))) != NULL) {

-                        funcname = cli_strndup(buffer, MIN(PE_MAXNAMESIZE, fsize - offset));

+                        funcname = CLI_STRNDUP(buffer, MIN(PE_MAXNAMESIZE, fsize - offset));

                         if (funcname == NULL) {

                             cli_dbgmsg("scan_pe: cannot duplicate function name\n");

                             return CL_EMEM;

@@ -2384,7 +2384,7 @@ static inline int hash_impfns(cli_ctx *ctx, void **hashctx, uint32_t *impsz, str

                 if (!err) {

                     /* Hint field is a uint16_t and precedes the Name field */

                     if ((buffer = fmap_need_off_once(map, offset + sizeof(uint16_t), MIN(PE_MAXNAMESIZE, fsize - offset))) != NULL) {

-                        funcname = cli_strndup(buffer, MIN(PE_MAXNAMESIZE, fsize - offset));

+                        funcname = CLI_STRNDUP(buffer, MIN(PE_MAXNAMESIZE, fsize - offset));

                         if (funcname == NULL) {

                             cli_dbgmsg("scan_pe: cannot duplicate function name\n");

                             return CL_EMEM;

@@ -2508,7 +2508,7 @@ static unsigned int hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *

             goto hash_imptbl_end;

         }

-        dllname = cli_strndup(buffer, MIN(PE_MAXNAMESIZE, fsize - offset));

+        dllname = CLI_STRNDUP(buffer, MIN(PE_MAXNAMESIZE, fsize - offset));

         if (dllname == NULL) {

             cli_dbgmsg("scan_pe: cannot duplicate dll name\n");

             ret = CL_EMEM;

@@ -454,36 +454,23 @@ char *cli_strrcpy(char *dest, const char *source) /* by NJH */

     return --dest;

 }

-#ifndef HAVE_STRCASESTR

-const char *cli_strcasestr(const char *a, const char *b)

+const char *__cli_strcasestr(const char *haystack, const char *needle)

 {

     size_t l;

     char f[3];

-    const size_t strlen_a = strlen(a);

-    const size_t strlen_b = strlen(b);

+    const size_t strlen_a = strlen(haystack);

+    const size_t strlen_b = strlen(needle);

-    f[0] = tolower(*b);

-    f[1] = toupper(*b);

+    f[0] = tolower(*needle);

+    f[1] = toupper(*needle);

     f[2] = '\0';

-    for (l = strcspn(a, f); l != strlen_a; l += strcspn(a + l + 1, f) + 1)

-        if (strncasecmp(a + l, b, strlen_b) == 0)

-            return (a + l);

+    for (l = strcspn(haystack, f); l != strlen_a; l += strcspn(haystack + l + 1, f) + 1)

+        if (strncasecmp(haystack + l, needle, strlen_b) == 0)

+            return (haystack + l);

     return (NULL);

 }

-#endif

-

-#if !defined(HAVE_STRNLEN) || defined(HAVE_STRNI)

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

-{

-    size_t i = 0;

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

-        ;

-    return i;

-}

-#endif

-#if !defined(HAVE_STRNDUP) || defined(HAVE_STRNI)

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

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

 {

     char *alloc;

     size_t len;

@@ -492,7 +479,7 @@ char *cli_strndup(const char *s, size_t n)

         return NULL;

     }

-    len   = cli_strnlen(s, n);

+    len   = CLI_STRNLEN(s, n);

     alloc = malloc(len + 1);

     if (!alloc) {

@@ -503,9 +490,15 @@ char *cli_strndup(const char *s, size_t n)

     alloc[len] = '\0';

     return alloc;

 }

-#endif

-#if !defined(HAVE_STRNSTR) || defined(HAVE_STRNI)

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

+{

+    size_t i = 0;

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

+        ;

+    return i;

+}

+

 /*

  * @brief Find the first occurrence of find in s.

  *

@@ -526,7 +519,7 @@ char *cli_strndup(const char *s, size_t n)

  * @param slen   haystack length

  * @return char* Address of the needle, if found, else NULL.

  */

-char *cli_strnstr(const char *s, const char *find, size_t slen)

+char *__cli_strnstr(const char *s, const char *find, size_t slen)

 {

     char c, sc;

     size_t len;

@@ -545,7 +538,6 @@ char *cli_strnstr(const char *s, const char *find, size_t slen)

     }

     return ((char *)s);

 }

-#endif

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

                        const char **tokens)

@@ -1214,13 +1206,13 @@ cl_error_t cli_basename(const char *filepath, size_t filepath_len,

     if ((index != filepath) || (index[0] == PATHSEP[0]))

         index++;

-    if (0 == cli_strnlen(index, filepath_len - (index - filepath))) {

+    if (0 == CLI_STRNLEN(index, filepath_len - (index - filepath))) {

         cli_dbgmsg("cli_basename: Provided path does not include a file name.\n");

         status = CL_EFORMAT;

         goto done;

     }

-    *filebase = cli_strndup(index, filepath_len - (index - filepath));

+    *filebase = CLI_STRNDUP(index, filepath_len - (index - filepath));

     if (NULL == *filebase) {

         cli_errmsg("cli_basename: Failed to allocate memory for file basename.\n");

         status = CL_EMEM;

@@ -30,38 +30,44 @@

 #include <limits.h>

 #include "clamav.h"

-#include "clamav.h"

 #define SIZE_T_CHARLEN ((sizeof(size_t) * CHAR_BIT + 2) / 3 + 1)

 #ifdef HAVE_STRCASESTR

-#define cli_strcasestr strcasestr

+#define CLI_STRCASESTR strcasestr

 #else

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

+#define CLI_STRCASESTR __cli_strcasestr

 #endif

 #if defined(HAVE_STRNDUP) && !defined(HAVE_STRNI)

-#define cli_strndup strndup

+#define CLI_STRNDUP strndup

 #else

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

+#define CLI_STRNDUP __cli_strndup

 #endif

 #if defined(HAVE_STRNLEN) && !defined(HAVE_STRNI)

-#define cli_strnlen strnlen

+#define CLI_STRNLEN strnlen

 #else

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

+#define CLI_STRNLEN __cli_strnlen

 #endif

 #if defined(HAVE_STRNSTR) && !defined(HAVE_STRNI)

-#define cli_strnstr strnstr

+#define CLI_STRNSTR strnstr

 #else

-char *cli_strnstr(const char *s, const char *find, size_t slen);

+#define CLI_STRNSTR __cli_strnstr

 #endif

 #include <stdio.h>

-#define cli_nocase(val) tolower(val)

-#define cli_nocasei(val) toupper(val)

+#define CLI_NOCASE(val) tolower(val)

+#define CLI_NOCASEI(val) toupper(val)

+

+/* Custom implementations for systems that do not include these functions. */

+const char *__cli_strcasestr(const char *haystack, const char *needle);

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

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

+char *__cli_strnstr(const char *s, const char *find, size_t slen);

+/* Custom string-manipulation functions */

 int cli_strbcasestr(const char *haystack, const char *needle);

 int cli_chomp(char *string);

 char *cli_strtok(const char *line, int field, const char *delim);

@@ -182,6 +182,10 @@ EXPORTS cli_genhash_pe @44384 NONAME

 EXPORTS cli_free_vba_project @44385 NONAME

 EXPORTS cli_strdup @44386 NONAME

 EXPORTS cli_realloc @44387 NONAME

+EXPORTS __cli_strcasestr @44388 NONAME

+EXPORTS __cli_strndup @44389 NONAME

+EXPORTS __cli_strnlen @44390 NONAME

+EXPORTS __cli_strnstr @44391 NONAME

 ; compatibility layer, tommath, zlib

 EXPORTS w32_srand @44269 NONAME