From ddab9e646122df077570fc0dfb2af1516c098668 Mon Sep 17 00:00:00 2001
From: Robert Clausecker <fuz@FreeBSD.org>
Date: Mon, 4 Dec 2023 12:32:49 -0500
Subject: [PATCH] lib/libc/amd64/string: implement strncat() by calling
 strlen(), memccpy()

This picks up the accelerated implementation of memccpy().

Tested by:	developers@, exp-run
Approved by:	mjg
MFC after:	1 month
MFC to:		stable/14
PR:		275785
Differential Revision: https://reviews.freebsd.org/D42902

(cherry picked from commit ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990)
---
 lib/libc/amd64/string/Makefile.inc |  1 +
 lib/libc/amd64/string/strncat.c    | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 lib/libc/amd64/string/strncat.c

diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc
index b569d2cb8be..a14e8a768f0 100644
--- a/lib/libc/amd64/string/Makefile.inc
+++ b/lib/libc/amd64/string/Makefile.inc
@@ -17,6 +17,7 @@ MDSRCS+= \
 	strlcat.c \
 	strlcpy.S \
 	strlen.S \
+	strncat.c \
 	strncmp.S \
 	strncpy.c \
 	strnlen.c \
diff --git a/lib/libc/amd64/string/strncat.c b/lib/libc/amd64/string/strncat.c
new file mode 100644
index 00000000000..33b278ac5e0
--- /dev/null
+++ b/lib/libc/amd64/string/strncat.c
@@ -0,0 +1,29 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2023 Robert Clausecker
+ */
+
+#include <sys/cdefs.h>
+
+#include <string.h>
+
+void *__memccpy(void *restrict, const void *restrict, int, size_t);
+
+char *
+strncat(char *dest, const char *src, size_t n)
+{
+	size_t len;
+	char *endptr;
+
+	len = strlen(dest);
+	endptr = __memccpy(dest + len, src, '\0', n);
+
+	/* avoid an extra branch */
+	if (endptr == NULL)
+		endptr = dest + len + n + 1;
+
+	endptr[-1] = '\0';
+
+	return (dest);
+}