lib: fix multiple strlcpy definition

baruchsiach · shemminger · commit 4f6b73380d2c · 2017-10-11T11:02:13.000-07:00
Some C libraries, like uClibc and musl, provide BSD compatible
strlcpy(). Add check_strlcpy() to configure, and avoid defining strlcpy
and strlcat when the C library provides them.

This fixes the following static link error with uClibc-ng:

.../sysroot/usr/lib/libc.a(strlcpy.os): In function `strlcpy':
strlcpy.c:(.text+0x0): multiple definition of `strlcpy'
../lib/libutil.a(utils.o):utils.c:(.text+0x1ddc): first defined here
collect2: error: ld returned 1 exit status

Acked-by: Phil Sutter &lt;phil@nwl.cc&gt;
Signed-off-by: Baruch Siach &lt;baruch@tkos.co.il&gt;
diff --git a/configure b/configure
@@ -326,6 +326,27 @@ EOF
     rm -f $TMPDIR/dbtest.c $TMPDIR/dbtest
 }
 
+check_strlcpy()
+{
+    cat >$TMPDIR/strtest.c <<EOF
+#include <string.h>
+int main(int argc, char **argv) {
+	char dst[10];
+	strlcpy(dst, "test", sizeof(dst));
+	return 0;
+}
+EOF
+    $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1
+    if [ $? -eq 0 ]
+    then
+	echo "no"
+    else
+	echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
+	echo "yes"
+    fi
+    rm -f $TMPDIR/strtest.c $TMPDIR/strtest
+}
+
 quiet_config()
 {
 	cat <<EOF
@@ -397,6 +418,9 @@ check_mnl
 echo -n "Berkeley DB: "
 check_berkeley_db
 
+echo -n "need for strlcpy: "
+check_strlcpy
+
 echo
 echo -n "docs:"
 check_docs
diff --git a/lib/utils.c b/lib/utils.c
@@ -1260,6 +1260,7 @@ int get_real_family(int rtm_type, int rtm_family)
 	return rtm_family;
 }
 
+#ifdef NEED_STRLCPY
 size_t strlcpy(char *dst, const char *src, size_t size)
 {
 	size_t srclen = strlen(src);
@@ -1282,3 +1283,4 @@ size_t strlcat(char *dst, const char *src, size_t size)
 
 	return dlen + strlcpy(dst + dlen, src, size - dlen);
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1260,6 +1260,7 @@ int get_real_family(int rtm_type, int rtm_family)`
`1260`	`1260`	`return rtm_family;`
`1261`	`1261`	`}`
`1262`	`1262`
	`1263`	`+#ifdef NEED_STRLCPY`
`1263`	`1264`	`size_t strlcpy(char dst, const char src, size_t size)`
`1264`	`1265`	`{`
`1265`	`1266`	`size_t srclen = strlen(src);`
`@@ -1282,3 +1283,4 @@ size_t strlcat(char dst, const char src, size_t size)`
`1282`	`1283`
`1283`	`1284`	`return dlen + strlcpy(dst + dlen, src, size - dlen);`
`1284`	`1285`	`}`
	`1286`	`+#endif`