blob: 952274bb97a07e444dd492c3b30860d807881473 [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001From 7b62e5884353b247f542844d1e4687d0e9211999 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 20 Jul 2017 04:27:32 -0700
4Subject: [PATCH 1/2] Check and use strlcpy from libc before defining own
5
6This is required especially on musl where
7function prototype conflicts and causes build
8failures.
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure.ac | 2 +-
13 lib/util.c | 2 ++
14 lib/util.h | 1 +
15 3 files changed, 4 insertions(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index 13064f6..596c43f 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -57,7 +57,7 @@ OFP_CHECK_HWTABLES
22 OFP_CHECK_HWLIBS
23 AC_SYS_LARGEFILE
24
25-AC_CHECK_FUNCS([strsignal])
26+AC_CHECK_FUNCS([strlcpy strsignal])
27
28 AC_ARG_VAR(KARCH, [Kernel Architecture String])
29 AC_SUBST(KARCH)
30diff --git a/lib/util.c b/lib/util.c
31index 21cc28d..1f341b1 100644
32--- a/lib/util.c
33+++ b/lib/util.c
34@@ -138,6 +138,7 @@ xasprintf(const char *format, ...)
35 return s;
36 }
37
38+#ifndef HAVE_STRLCPY
39 void
40 strlcpy(char *dst, const char *src, size_t size)
41 {
42@@ -148,6 +149,7 @@ strlcpy(char *dst, const char *src, size_t size)
43 dst[n_copy] = '\0';
44 }
45 }
46+#endif
47
48 void
49 ofp_fatal(int err_no, const char *format, ...)
50diff --git a/lib/util.h b/lib/util.h
51index fde681f..9e45ea9 100644
52--- a/lib/util.h
53+++ b/lib/util.h
54@@ -41,6 +41,7 @@
55 #include <stdio.h>
56 #include <string.h>
57 #include "compiler.h"
58+#include "config.h"
59
60 #ifndef va_copy
61 #ifdef __va_copy
62--
632.13.3
64