--- libelwix/inc/elwix.h 2015/06/25 00:36:47 1.12.4.1 +++ libelwix/inc/elwix.h 2022/01/06 15:13:01 1.20 @@ -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.20 2022/01/06 15:13:01 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 -Copyright 2004 - 2015 +Copyright 2004 - 2022 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -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 @@ -72,6 +78,9 @@ SUCH DAMAGE. #include #include #include +#include +#include +#include #ifndef STRSIZ @@ -210,6 +219,25 @@ void elwixFini(); */ 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); extern void *(*e_calloc)(size_t, size_t); @@ -231,13 +259,23 @@ extern int elwix_Verbose; if ((x) <= elwix_Verbose) { \ char __str[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; \ snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ - syslog(LOG_DEBUG, "Verbose(%d):%s(%d): %s\n", \ + syslog(LOG_INFO, "Verbose(%d):%s(%d): %s\n", \ (x), __func__, __LINE__, __str); \ } \ } while (0) +#define EVERBOSE2(x, fmt, ...) do { assert((fmt)); \ + if ((x) <= elwix_Verbose) { \ + char __str[0x10000] = { [0 ... 0xffff] = 0 }; \ + snprintf(__str, sizeof __str, (fmt), ##__VA_ARGS__); \ + syslog(LOG_INFO, "Verbose(%d):%s(%d): %s\n", \ + (x), __func__, __LINE__, __str); \ + } \ + } while (0) /* Debug macros */ extern int elwix_Debug; +#define e_Debug elwix_Debug + #define ELWIX_DEBUG_OFF 0x0 #define ELWIX_DEBUG_TRACE 0x1 #define ELWIX_DEBUG_LOG 0x2 @@ -276,10 +314,13 @@ extern int elwix_Debug; __func__, __LINE__, (x), __str); \ } while (0) #define ESYSERR(x) do { \ - if (x > 0 || errno) \ + if (x > 0 || errno) { \ + int _ern = errno; \ syslog(LOG_ERR, "Error(sys):%s(%d): #%d - %s\n", \ __func__, __LINE__, x > 0 ? x : errno, \ strerror(x > 0 ? x : errno)); \ + errno = _ern; \ + } \ } while (0) #define ELIBERR(ait) do { \ if (ait##_GetErrno()) \