Adding upstream version 2.0.24.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
e508fcfeb9
commit
afb0a8fea7
GPG key ID:
FBB4F0E80A80222F
118 changed files with 45084 additions and 0 deletions
44
compat/check_includes.sh
Executable file
44
compat/check_includes.sh
Executable file
|
|
@ -0,0 +1,44 @@
|
|||
#!/bin/sh
|
||||
|
||||
RETVAL=0
|
||||
|
||||
# params - paths to the source files to search
|
||||
SRC="$*"
|
||||
|
||||
# param FUNC - name of the function in compat to check
|
||||
check_compat_func () {
|
||||
FILES=`grep -rE "([^[:alnum:]]|^)$1\([^\)]+\)" --include=\*.{c,h} $SRC | cut -d: -f1 | uniq`
|
||||
for f in $FILES; do
|
||||
grep -q "#include \"compat.h\"" $f
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Missing #include \"compat.h\" in file $f for function $1()"
|
||||
RETVAL=$((RETVAL+1))
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
check_compat_macro () {
|
||||
FILES=`grep -rE "([^[:alnum:]]|^)$1([^[:alnum:]]|$)" --include=\*.{c,h} $SRC | cut -d: -f1 | uniq`
|
||||
for f in $FILES; do
|
||||
grep -q "#include \"compat.h\"" $f
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Missing #include \"compat.h\" in file $f for macro $1"
|
||||
RETVAL=$((RETVAL+1))
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
check_compat_func vdprintf
|
||||
check_compat_func asprintf
|
||||
check_compat_func vasprintf
|
||||
check_compat_func getline
|
||||
check_compat_func strndup
|
||||
check_compat_func strnstr
|
||||
check_compat_func strdupa
|
||||
check_compat_func strchrnul
|
||||
check_compat_func get_current_dir_name
|
||||
check_compat_func pthread_mutex_timedlock
|
||||
check_compat_func UNUSED
|
||||
check_compat_macro _PACKED
|
||||
|
||||
exit $RETVAL
|
||||
250
compat/compat.c
Normal file
250
compat/compat.c
Normal file
|
|
@ -0,0 +1,250 @@
|
|||
/**
|
||||
* @file compat.c
|
||||
* @author Michal Vasko <mvasko@cesnet.cz>
|
||||
* @brief compatibility functions
|
||||
*
|
||||
* Copyright (c) 2021 CESNET, z.s.p.o.
|
||||
*
|
||||
* This source code is licensed under BSD 3-Clause License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*/
|
||||
#define _POSIX_C_SOURCE 200809L /* fdopen, _POSIX_PATH_MAX, strdup */
|
||||
#define _ISOC99_SOURCE /* vsnprintf */
|
||||
|
||||
#include "compat.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <inttypes.h>
|
||||
#include <limits.h>
|
||||
#include <pthread.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#ifndef HAVE_VDPRINTF
|
||||
int
|
||||
vdprintf(int fd, const char *format, va_list ap)
|
||||
{
|
||||
FILE *stream;
|
||||
int count = 0;
|
||||
|
||||
stream = fdopen(dup(fd), "a+");
|
||||
if (stream) {
|
||||
count = vfprintf(stream, format, ap);
|
||||
fclose(stream);
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ASPRINTF
|
||||
int
|
||||
asprintf(char **strp, const char *fmt, ...)
|
||||
{
|
||||
int ret;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
ret = vasprintf(strp, fmt, ap);
|
||||
va_end(ap);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_VASPRINTF
|
||||
int
|
||||
vasprintf(char **strp, const char *fmt, va_list ap)
|
||||
{
|
||||
va_list ap2;
|
||||
|
||||
va_copy(ap2, ap);
|
||||
int l = vsnprintf(0, 0, fmt, ap2);
|
||||
|
||||
va_end(ap2);
|
||||
|
||||
if ((l < 0) || !(*strp = malloc(l + 1U))) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return vsnprintf(*strp, l + 1U, fmt, ap);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETLINE
|
||||
ssize_t
|
||||
getline(char **lineptr, size_t *n, FILE *stream)
|
||||
{
|
||||
static char line[256];
|
||||
char *ptr;
|
||||
ssize_t len;
|
||||
|
||||
if (!lineptr || !n) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (ferror(stream) || feof(stream)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!fgets(line, 256, stream)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
ptr = strchr(line, '\n');
|
||||
if (ptr) {
|
||||
*ptr = '\0';
|
||||
}
|
||||
|
||||
len = strlen(line);
|
||||
|
||||
if (len + 1 < 256) {
|
||||
ptr = realloc(*lineptr, 256);
|
||||
if (!ptr) {
|
||||
return -1;
|
||||
}
|
||||
*lineptr = ptr;
|
||||
*n = 256;
|
||||
}
|
||||
|
||||
strcpy(*lineptr, line);
|
||||
return len;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRNDUP
|
||||
char *
|
||||
strndup(const char *s, size_t n)
|
||||
{
|
||||
char *buf;
|
||||
size_t len = 0;
|
||||
|
||||
/* strnlen */
|
||||
for ( ; (len < n) && (s[len] != '\0'); ++len) {}
|
||||
|
||||
if (!(buf = malloc(len + 1U))) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(buf, s, len);
|
||||
buf[len] = '\0';
|
||||
return buf;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRNSTR
|
||||
char *
|
||||
strnstr(const char *s, const char *find, size_t slen)
|
||||
{
|
||||
char c, sc;
|
||||
size_t len;
|
||||
|
||||
if ((c = *find++) != '\0') {
|
||||
len = strlen(find);
|
||||
do {
|
||||
do {
|
||||
if ((slen-- < 1) || ((sc = *s++) == '\0')) {
|
||||
return NULL;
|
||||
}
|
||||
} while (sc != c);
|
||||
if (len > slen) {
|
||||
return NULL;
|
||||
}
|
||||
} while (strncmp(s, find, len));
|
||||
s--;
|
||||
}
|
||||
return (char *)s;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRCHRNUL
|
||||
char *
|
||||
strchrnul(const char *s, int c)
|
||||
{
|
||||
char *p = strchr(s, c);
|
||||
|
||||
return p ? p : (char *)s + strlen(s);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GET_CURRENT_DIR_NAME
|
||||
char *
|
||||
get_current_dir_name(void)
|
||||
{
|
||||
char tmp[_POSIX_PATH_MAX];
|
||||
char *retval = NULL;
|
||||
|
||||
if (getcwd(tmp, sizeof(tmp))) {
|
||||
retval = strdup(tmp);
|
||||
if (!retval) {
|
||||
errno = ENOMEM;
|
||||
}
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
|
||||
int
|
||||
pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *abstime)
|
||||
{
|
||||
int64_t nsec_diff;
|
||||
int32_t diff;
|
||||
struct timespec cur, dur;
|
||||
int rc;
|
||||
|
||||
/* try to acquire the lock and, if we fail, sleep for 5ms. */
|
||||
while ((rc = pthread_mutex_trylock(mutex)) == EBUSY) {
|
||||
/* get real time */
|
||||
#ifdef CLOCK_REALTIME
|
||||
clock_gettime(CLOCK_REALTIME, &cur);
|
||||
#else
|
||||
struct timeval tv;
|
||||
|
||||
gettimeofday(&tv, NULL);
|
||||
cur.tv_sec = (time_t)tv.tv_sec;
|
||||
cur.tv_nsec = 1000L * (long)tv.tv_usec;
|
||||
#endif
|
||||
|
||||
/* get time diff */
|
||||
nsec_diff = 0;
|
||||
nsec_diff += (((int64_t)abstime->tv_sec) - ((int64_t)cur.tv_sec)) * 1000000000L;
|
||||
nsec_diff += ((int64_t)abstime->tv_nsec) - ((int64_t)cur.tv_nsec);
|
||||
diff = (nsec_diff ? nsec_diff / 1000000L : 0);
|
||||
|
||||
if (diff < 1) {
|
||||
/* timeout */
|
||||
break;
|
||||
} else if (diff < 5) {
|
||||
/* sleep until timeout */
|
||||
dur.tv_sec = 0;
|
||||
dur.tv_nsec = (long)diff * 1000000;
|
||||
} else {
|
||||
/* sleep 5 ms */
|
||||
dur.tv_sec = 0;
|
||||
dur.tv_nsec = 5000000;
|
||||
}
|
||||
|
||||
nanosleep(&dur, NULL);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
#endif
|
||||
158
compat/compat.h.in
Normal file
158
compat/compat.h.in
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
/**
|
||||
* @file compat.h
|
||||
* @author Michal Vasko <mvasko@cesnet.cz>
|
||||
* @brief compatibility functions header
|
||||
*
|
||||
* Copyright (c) 2021 CESNET, z.s.p.o.
|
||||
*
|
||||
* This source code is licensed under BSD 3-Clause License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef _COMPAT_H_
|
||||
#define _COMPAT_H_
|
||||
|
||||
#include <limits.h>
|
||||
#include <pthread.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <time.h>
|
||||
|
||||
#ifndef __WORDSIZE
|
||||
# if defined __x86_64__ && !defined __ILP32__
|
||||
# define __WORDSIZE 64
|
||||
# else
|
||||
# define __WORDSIZE 32
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef __INT64_C
|
||||
# if __WORDSIZE == 64
|
||||
# define __INT64_C(c) c ## L
|
||||
# define __UINT64_C(c) c ## UL
|
||||
# else
|
||||
# define __INT64_C(c) c ## LL
|
||||
# define __UINT64_C(c) c ## ULL
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if (@CMAKE_C_COMPILER_ID@ == GNU) || (@CMAKE_C_COMPILER_ID@ == Clang)
|
||||
# define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
|
||||
# define _PACKED __attribute__((__packed__))
|
||||
#else
|
||||
# define UNUSED(x) UNUSED_ ## x
|
||||
# define _PACKED
|
||||
#endif
|
||||
|
||||
#cmakedefine HAVE_VDPRINTF
|
||||
#cmakedefine HAVE_ASPRINTF
|
||||
#cmakedefine HAVE_VASPRINTF
|
||||
#cmakedefine HAVE_GETLINE
|
||||
#cmakedefine HAVE_STRNDUP
|
||||
#cmakedefine HAVE_STRNSTR
|
||||
#cmakedefine HAVE_STRDUPA
|
||||
#cmakedefine HAVE_STRCHRNUL
|
||||
#cmakedefine HAVE_GET_CURRENT_DIR_NAME
|
||||
#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK
|
||||
|
||||
#ifndef bswap64
|
||||
#define bswap64(val) \
|
||||
( (((val) >> 56) & 0x00000000000000FF) | (((val) >> 40) & 0x000000000000FF00) | \
|
||||
(((val) >> 24) & 0x0000000000FF0000) | (((val) >> 8) & 0x00000000FF000000) | \
|
||||
(((val) << 8) & 0x000000FF00000000) | (((val) << 24) & 0x0000FF0000000000) | \
|
||||
(((val) << 40) & 0x00FF000000000000) | (((val) << 56) & 0xFF00000000000000) )
|
||||
#endif
|
||||
|
||||
#undef le64toh
|
||||
#undef htole64
|
||||
|
||||
#cmakedefine IS_BIG_ENDIAN
|
||||
|
||||
#ifdef IS_BIG_ENDIAN
|
||||
# define le64toh(x) bswap64(x)
|
||||
# define htole64(x) bswap64(x)
|
||||
#else
|
||||
# define le64toh(x) (x)
|
||||
# define htole64(x) (x)
|
||||
#endif
|
||||
|
||||
#cmakedefine HAVE_STDATOMIC
|
||||
|
||||
#ifdef HAVE_STDATOMIC
|
||||
# include <stdatomic.h>
|
||||
|
||||
# define ATOMIC_T atomic_uint_fast32_t
|
||||
# define ATOMIC_T_MAX UINT_FAST32_MAX
|
||||
|
||||
# define ATOMIC_STORE_RELAXED(var, x) atomic_store_explicit(&(var), x, memory_order_relaxed)
|
||||
# define ATOMIC_LOAD_RELAXED(var) atomic_load_explicit(&(var), memory_order_relaxed)
|
||||
# define ATOMIC_INC_RELAXED(var) atomic_fetch_add_explicit(&(var), 1, memory_order_relaxed)
|
||||
# define ATOMIC_ADD_RELAXED(var, x) atomic_fetch_add_explicit(&(var), x, memory_order_relaxed)
|
||||
# define ATOMIC_DEC_RELAXED(var) atomic_fetch_sub_explicit(&(var), 1, memory_order_relaxed)
|
||||
# define ATOMIC_SUB_RELAXED(var, x) atomic_fetch_sub_explicit(&(var), x, memory_order_relaxed)
|
||||
#else
|
||||
# include <stdint.h>
|
||||
|
||||
# define ATOMIC_T uint32_t
|
||||
# define ATOMIC_T_MAX UINT32_MAX
|
||||
|
||||
# define ATOMIC_STORE_RELAXED(var, x) ((var) = (x))
|
||||
# define ATOMIC_LOAD_RELAXED(var) (var)
|
||||
# define ATOMIC_INC_RELAXED(var) __sync_fetch_and_add(&(var), 1)
|
||||
# define ATOMIC_ADD_RELAXED(var, x) __sync_fetch_and_add(&(var), x)
|
||||
# define ATOMIC_DEC_RELAXED(var) __sync_fetch_and_sub(&(var), 1)
|
||||
# define ATOMIC_SUB_RELAXED(var, x) __sync_fetch_and_sub(&(var), x)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_VDPRINTF
|
||||
int vdprintf(int fd, const char *format, va_list ap);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ASPRINTF
|
||||
int asprintf(char **strp, const char *fmt, ...);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_VASPRINTF
|
||||
int vasprintf(char **strp, const char *fmt, va_list ap);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETLINE
|
||||
ssize_t getline(char **lineptr, size_t *n, FILE *stream);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRNDUP
|
||||
char *strndup(const char *s, size_t n);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRNSTR
|
||||
char *strnstr(const char *s, const char *find, size_t slen);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRDUPA
|
||||
#define strdupa(s) ( \
|
||||
{ \
|
||||
char *buf; \
|
||||
size_t len = strlen(s); \
|
||||
buf = alloca(len + 1); \
|
||||
buf[len] = '\0'; \
|
||||
(char *)memcpy(buf, s, len); \
|
||||
})
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRCHRNUL
|
||||
char *strchrnul(const char *s, int c);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GET_CURRENT_DIR_NAME
|
||||
char *get_current_dir_name(void);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
|
||||
int pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *abstime);
|
||||
#endif
|
||||
|
||||
#endif /* _COMPAT_H_ */
|
||||
Loading…
Add table
Add a link
Reference in a new issue