From 0e2be0c217028e73073e7f9ccb010cc8b4d756db Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 30 Jul 2015 17:31:31 +0200 Subject: build-sys: check for strndupa strndupa is a GNU extension, therefore it's not available for all libc libraries (musl). This patch is based on the one proposed by Emil Renner Berthing for systemd [1]. [1] http://lists.freedesktop.org/archives/systemd-devel/2014-September/023190.html Signed-off-by: Romain Naour --- src/shared/missing.h | 11 +++++++++++ src/shared/selinux-util.c | 1 + 2 files changed, 12 insertions(+) (limited to 'src/shared') diff --git a/src/shared/missing.h b/src/shared/missing.h index 2dc9d842d3..9031119a45 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -158,3 +158,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle #ifndef AT_EMPTY_PATH #define AT_EMPTY_PATH 0x1000 #endif + +#if !HAVE_DECL_STRNDUPA +#define strndupa(s, n) \ + ({ \ + const char *__old = (s); \ + size_t __len = strnlen(__old, (n)); \ + char *__new = (char *)alloca(__len + 1); \ + __new[__len] = '\0'; \ + (char *)memcpy(__new, __old, __len); \ + }) +#endif diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c index 4e0866be5f..a18a5a7230 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -31,6 +31,7 @@ #include "strv.h" #include "path-util.h" #include "selinux-util.h" +#include "missing.h" #ifdef HAVE_SELINUX DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon); -- cgit v1.2.3-54-g00ecf