Gitiles
Code Review Sign In
192.168.1.100 / T108 / e958203796650e3959a43708d67534bf36f4c83b / . / external / management / net / pcapsipdump / patches / 01-use-libc-strlcpy-if-available-v2.patch
blob: a69902c009647e5819b10564968c87a652927767 [file] [log] [blame]
b.liue9582032025-04-17 19:18:16 +0800[diff] [blame^]1--- a/Makefile
2+++ b/Makefile
3@@ -2,8 +2,12 @@ LIBS ?= -lpcap -lstdc++
4 RELEASEFLAGS ?= -O3 -Wall
5 #CXXFLAGS ?= --std=c++0x
6
7+# check if libc provides BSD's strlcpy
8+ifeq ($(shell $(CXX) $(CXXFLAGS) -D_BSD_SOURCE $(LDFLAGS) $(DEFS) -o /dev/null \
9+ make-checks/strlcpy.cpp 2>/dev/null; echo $$?),0)
10+ BSDSTR_DEFS := -D_BSD_SOURCE -DUSE_LIBC_STRLCPY
11 # auto-detect if bsd/strings.h is available
12-ifeq ($(shell $(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFS) -E -o /dev/null \
13+else ifeq ($(shell $(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFS) -E -o /dev/null \
14 make-checks/libbsd.cpp 2>/dev/null; echo $$?),0)
15 BSDSTR_DEFS := -DUSE_BSD_STRING_H
16 BSDSTR_LIBS := -lbsd
17--- a/pcapsipdump_lib.h
18+++ b/pcapsipdump_lib.h
19@@ -3,7 +3,7 @@
20 #ifndef BSD
21 #ifdef USE_BSD_STRING_H
22 #include <bsd/string.h>
23- #else
24+ #elif !defined(USE_LIBC_STRLCPY)
25 #define strlcpy strncpy
26 #endif
27 #endif
28--- a/make-checks/all.mk
29+++ b/make-checks/all.mk
30@@ -1,5 +1,5 @@
31-make-checks/all: make-checks/cxx make-checks/libpcap make-checks/libbsd
32+make-checks/all: make-checks/cxx make-checks/libpcap make-checks/strlcpy make-checks/libbsd
33 @touch make-checks/all
34
35 make-checks/clean:
36- rm -f make-checks/all make-checks/cxx make-checks/libpcap make-checks/libbsd
37+ rm -f make-checks/all make-checks/cxx make-checks/libpcap make-checks/strlcpy make-checks/libbsd
38--- a/make-checks/libbsd.mk
39+++ b/make-checks/libbsd.mk
40@@ -2,5 +2,5 @@ CHECK_LIBBSD = $(CXX) $(CXXFLAGS) $(LDFL
41
42 make-checks/libbsd:
43 @$(CHECK_LIBBSD) || (\
44- echo "*** notice: recommended library not found: libbsd"; \
45+ echo "*** notice: library not found: libbsd"; \
46 true)
47--- /dev/null
48+++ b/make-checks/strlcpy.cpp
49@@ -0,0 +1,6 @@
50+#include <string.h>
51+int main(int argc, char **argv) {
52+ char dst[10];
53+ strlcpy(dst, "test", sizeof(dst));
54+ return 0;
55+}
56--- /dev/null
57+++ b/make-checks/strlcpy.mk
58@@ -0,0 +1,6 @@
59+CHECK_STRLCPY = $(CXX) $(CXXFLAGS) -D_BSD_SOURCE $(LDFLAGS) make-checks/strlcpy.cpp -o make-checks/strlcpy 2>/dev/null
60+
61+make-checks/strlcpy:
62+ @$(CHECK_STRLCPY) || (\
63+ echo "*** notice: your libc doesn't provide strlcpy()"; \
64+ true)