--- libelwix/inc/elwix.h 2015/06/25 00:36:47 1.12.4.1 +++ libelwix/inc/elwix.h 2017/01/09 12:53:18 1.15 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: elwix.h,v 1.12.4.1 2015/06/25 00:36:47 misho Exp $ +* $Id: elwix.h,v 1.15 2017/01/09 12:53:18 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -49,16 +49,22 @@ SUCH DAMAGE. #include #include +#include #include #include -#include #include -#include #include +#ifndef __linux__ +#include +#include #include +#else +#include +#endif #include #include +#include #include #include #include @@ -209,6 +215,25 @@ void elwixFini(); * return: 1 = little endian or 0 big endian */ int elwix_byteOrder(); + +#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); +#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); +#endif /* memory management hooks */ extern void *(*e_malloc)(size_t);