1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
From 9867a9d6a21e6b0b9bcba57c3e2398fe671cea17 Mon Sep 17 00:00:00 2001
From: Christian Storm <christian.storm@siemens.com>
Date: Tue, 16 Jan 2018 10:34:52 +0100
Subject: [PATCH] compat.h: introduce compatibility header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Introduce a compat.h housing compatibility definitions
and macros along the lines of commit 7b49b8d having
introduced a compatibility mechanism for Lua.
First use case (and motivation) is the support for
musl (https://www.musl-libc.org/) which doesn't
bother to provide
char *strndupa(const char *s, size_t n)
Backported from: 9867a9d6a21e6b0b9bcba57c3e2398fe671cea17
Reviewed-by: Stefano Babic <sbabic@denx.de>
Reported-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Christian Storm <christian.storm@siemens.com>
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
include/compat.h | 24 ++++++++++++++++++++++++
include/util.h | 1 +
ipc/network_ipc.c | 1 +
3 files changed, 26 insertions(+)
create mode 100644 include/compat.h
diff --git a/include/compat.h b/include/compat.h
new file mode 100644
index 0000000..29d7af1
--- /dev/null
+++ b/include/compat.h
@@ -0,0 +1,24 @@
+/*
+ * Author: Christian Storm
+ * Copyright (C) 2018, Siemens AG
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#pragma once
+
+#ifndef strndupa
+/*
+ * Define char *strndupa(const char *s, size_t n)
+ * for, e.g., musl (https://www.musl-libc.org/)
+ * which does not bother to implement this function.
+ */
+#define strndupa(s, n) \
+ (__extension__({ \
+ const char *__in = (s); \
+ size_t __len = strnlen(__in, (n)) + 1; \
+ char *__out = (char *)alloca(__len); \
+ __out[__len - 1] = '\0'; \
+ (char *)memcpy(__out, __in, __len - 1); \
+ }))
+#endif
diff --git a/include/util.h b/include/util.h
index bec2975..d43cd8c 100644
--- a/include/util.h
+++ b/include/util.h
@@ -12,6 +12,7 @@
#include <string.h>
#include "swupdate.h"
#include "swupdate_status.h"
+#include "compat.h"
#define NOTIFY_BUF_SIZE 2048
#define ENOMEM_ASPRINTF -1
diff --git a/ipc/network_ipc.c b/ipc/network_ipc.c
index 3f197c7..48f6fcc 100644
--- a/ipc/network_ipc.c
+++ b/ipc/network_ipc.c
@@ -27,6 +27,7 @@
#include <pthread.h>
#include "network_ipc.h"
+#include "compat.h"
#ifdef CONFIG_SOCKET_CTRL_PATH
static char* SOCKET_CTRL_PATH = (char*)CONFIG_SOCKET_CTRL_PATH;
--
2.15.1
|
