From: Phil Sutter <phil@nwl.cc>
Date: Fri, 1 Sep 2017 16:52:51 +0000 (+0200)
Subject: utils: Implement strlcpy() and strlcat()
X-Git-Tag: v4.13.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d15e012a3227d79295cd95582bb6d8a6f0bdc92;p=thirdparty%2Fiproute2.git

utils: Implement strlcpy() and strlcat()

By making use of strncpy(), both implementations are really simple so
there is no need to add libbsd as additional dependency.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---

diff --git a/include/utils.h b/include/utils.h
index 7a3b3fd24..f161588b0 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -251,4 +251,7 @@ int make_path(const char *path, mode_t mode);
 char *find_cgroup2_mount(void);
 int get_command_name(const char *pid, char *comm, size_t len);
 
+size_t strlcpy(char *dst, const char *src, size_t size);
+size_t strlcat(char *dst, const char *src, size_t size);
+
 #endif /* __UTILS_H__ */
diff --git a/lib/utils.c b/lib/utils.c
index 9143ed228..330ab073c 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1230,3 +1230,22 @@ int get_real_family(int rtm_type, int rtm_family)
 
 	return rtm_family;
 }
+
+size_t strlcpy(char *dst, const char *src, size_t size)
+{
+	if (size) {
+		strncpy(dst, src, size - 1);
+		dst[size - 1] = '\0';
+	}
+	return strlen(src);
+}
+
+size_t strlcat(char *dst, const char *src, size_t size)
+{
+	size_t dlen = strlen(dst);
+
+	if (dlen > size)
+		return dlen + strlen(src);
+
+	return dlen + strlcpy(dst + dlen, src, size - dlen);
+}