From: Alejandro Colomar <alx@kernel.org>
Date: Sun, 12 Nov 2023 13:10:57 +0000 (+0100)
Subject: lib/date_to_str.c, configure.ac: Replace calls to strlcpy(3) by strtcpy(3)
X-Git-Tag: 4.15.0-rc1~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2eceb4381c3d92b1111918170745d1e6fb0d2a32;p=thirdparty%2Fshadow.git

lib/date_to_str.c, configure.ac: Replace calls to strlcpy(3) by strtcpy(3)

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/configure.ac b/configure.ac
index 6bea1167c..2c8cca3fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,7 +434,6 @@ if test "$with_libbsd" != "no"; then
 	AC_DEFINE(WITH_LIBBSD, 1, [Build shadow with libbsd support])
 else
 	AC_DEFINE(WITH_LIBBSD, 0, [Build shadow without libbsd support])
-	AC_CHECK_FUNC(strlcpy, [], [AC_MSG_ERROR([strlcpy is required from glibc >= 2.38 or libbsd])])
 fi
 AM_CONDITIONAL(WITH_LIBBSD, test x$with_libbsd = xyes)
 
diff --git a/lib/date_to_str.c b/lib/date_to_str.c
index 9d004d9ee..cb3f6d5af 100644
--- a/lib/date_to_str.c
+++ b/lib/date_to_str.c
@@ -33,6 +33,7 @@
 
 #ident "$Id$"
 
+#include "strtcpy.h"
 #include "prototypes.h"
 
 void
@@ -43,13 +44,13 @@ date_to_str(size_t size, char buf[size], long date)
 
 	t = date;
 	if (date < 0) {
-		(void) strlcpy(buf, "never", size);
+		(void) strtcpy(buf, "never", size);
 		return;
 	}
 
 	tm = gmtime(&t);
 	if (tm == NULL) {
-		(void) strlcpy(buf, "future", size);
+		(void) strtcpy(buf, "future", size);
 		return;
 	}