--- libelwix/src/elwix.c	2014/02/21 13:15:32	1.3.12.1
+++ libelwix/src/elwix.c	2017/01/09 12:53:18	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: elwix.c,v 1.3.12.1 2014/02/21 13:15:32 misho Exp $
+* $Id: elwix.c,v 1.9 2017/01/09 12:53:18 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2014
+Copyright 2004 - 2016
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -119,15 +119,16 @@ elwix_mm_inuse()
 }
 
 
+#pragma GCC visibility push(hidden)
 // init libelwix routine
-__attribute__((constructor)) void
+__attribute__((constructor)) static void
 _elwix_init()
 {
-	elwixInit(ELWIX_MPOOL, 0);
+	elwixInit(MEMMGR, 0);
 }
 
 // fini libelwix routine
-__attribute__((destructor)) void
+__attribute__((destructor)) static void
 _elwix_fini()
 {
 	elwixFini();
@@ -193,6 +194,7 @@ elwixFini()
 			break;
 	}
 }
+#pragma GCC visibility pop
 
 /*
  * elwix_byteOrder() - Detect platform byte order
@@ -206,3 +208,71 @@ elwix_byteOrder()
 
 	return *(char*) &x;
 }
+
+#ifndef strlcpy
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	register size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n)
+		while (--n)
+			if ((*d++ = *s++) == '\0')
+				break;
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (!n) {
+		if (siz)
+			*d = '\0';	/* NUL-terminate dst */
+		while (*s++);
+	}
+
+	return (s - src - 1);	/* count does not include NUL */
+}
+#endif
+
+#ifndef strlcat
+/*
+ * 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
+strlcat(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	register size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- && *d != '\0')
+		d++;
+
+	dlen = d - dst;
+	n = siz - dlen;
+	if (!n)
+		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