blob: d7085a8565975ea7b8f1a51add64563787a01954 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 8b639f9faf6199e47b9eae0698d01a22917b6abe Mon Sep 17 00:00:00 2001
2From: Tim Orling <timothy.t.orling@linux.intel.com>
3Date: Fri, 29 Dec 2017 09:17:17 -0800
4Subject: [PATCH] Provide implementation of strndupa for musl
5
6Reuse the approach from oe-core:
7/meta/recipes-core/systemd/systemd/0002-src-basic-missing.h-check-for-missing-strndupa.patch
8
9Original patch author: Emil Renner Berthing <systemd@esmil.dk>
10
11Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com
12---
13Upstream-Status: Pending
14
15 systemd/util.c | 11 +++++++++++
16 1 file changed, 11 insertions(+)
17
18diff --git a/systemd/util.c b/systemd/util.c
19index e02c825..277e611 100644
20--- a/systemd/util.c
21+++ b/systemd/util.c
22@@ -34,6 +34,17 @@
23
24 #include "util.h"
25
26+#if !HAVE_DECL_STRNDUPA
27+#define strndupa(s, n) \
28+ ({ \
29+ const char *__old = (s); \
30+ size_t __len = strnlen(__old, (n)); \
31+ char *__new = (char *)alloca(__len + 1); \
32+ __new[__len] = '\0'; \
33+ (char *)memcpy(__new, __old, __len); \
34+ })
35+#endif
36+
37 int safe_atou(const char *s, unsigned *ret_u) {
38 char *x = NULL;
39 unsigned long l;
40--
412.13.6
42