diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-10-25 00:16:21 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-10-28 20:23:16 +0100 |
| commit | 887b67908d0e6a2b2f50e04319c1cf4412a25f89 (patch) | |
| tree | 74cb366e12ab7479bd8503e0e582fca5fc971ba5 | |
| parent | 8b80fb92e5e07637f42382ec4e6e3417ade185c9 (diff) | |
Add libutil implementation for strndup in case it isn't available
"Some" "non-POSIX systems" don't have that.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/util/compat.h | 4 | ||||
| -rw-r--r-- | lib/util/Makemodule.am | 1 | ||||
| -rw-r--r-- | lib/util/strndup.c | 31 |
4 files changed, 38 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 0bf09ce..6093717 100644 --- a/configure.ac +++ b/configure.ac @@ -218,6 +218,8 @@ AX_COMPILE_CHECK_SIZEOF(long long) AC_CHECK_HEADERS([sys/xattr.h], [], []) AC_CHECK_HEADERS([sys/sysinfo.h], [], []) +AC_CHECK_FUNCS([strndup]) + ##### generate output ##### AC_CONFIG_HEADERS([config.h]) diff --git a/include/util/compat.h b/include/util/compat.h index d69a1de..8566090 100644 --- a/include/util/compat.h +++ b/include/util/compat.h @@ -110,4 +110,8 @@ struct stat { #include <sys/sysmacros.h> #endif +#ifndef HAVE_STRNDUP +char *strndup(const char *str, size_t max_len); +#endif + #endif /* COMPAT_H */ diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index ffd594d..e624bbd 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -1,6 +1,7 @@ libutil_la_SOURCES = include/util/util.h include/util/compat.h libutil_la_SOURCES += lib/util/str_table.c include/util/str_table.h libutil_la_SOURCES += lib/util/alloc.c lib/util/canonicalize_name.c +libutil_la_SOURCES += lib/util/strndup.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) libutil_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/lib/util/strndup.c b/lib/util/strndup.c new file mode 100644 index 0000000..8031d23 --- /dev/null +++ b/lib/util/strndup.c @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: LGPL-3.0-or-later */ +/* + * strndup.c + * + * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at> + */ +#include "config.h" +#include "util/compat.h" + +#include <string.h> +#include <stdlib.h> + +#ifndef HAVE_STRNDUP +char *strndup(const char *str, size_t max_len) +{ + size_t len = 0; + char *out; + + while (len < max_len && str[len] != '\0') + ++len; + + out = malloc(len + 1); + + if (out != NULL) { + memcpy(out, str, len); + out[len] = '\0'; + } + + return out; +} +#endif |