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

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

@@ -364,6 +364,17 @@ static const unsigned int fragsz[] = {

   134217728,

 };

 #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 {

@@ -117,6 +117,17 @@ 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;