From nobody Mon Dec 25 14:26:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvb35WKz54n8W; Mon, 25 Dec 2023 14:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvb17Wlz3NDp; Mon, 25 Dec 2023 14:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=td4trl1KOrL/DQ7us4uHW5h8bcX+8W5uwzWpWL2hPoA=; b=K9UsxF+GlMoqQClJHmVSePbUN7JRpUEsoVgvZCF3UBrXmPiwOVoMSFNKd7CjGo1ibd5d5l zteyHxgxXXKCqgHa/dd9WsujrWf/TpgTZoNuFJGtP7KG6NoEeqR3ObI6Un1g8bDaQZlMTi 0DKJkHlfbI13y5RwhM3ytRqSt2R4Yd2fDBlOEko/34JglOPs5EZ/J0oToZ7Yunk20L7L7M pf3ad4lG0psoLOVnD4vc821TWsqRescQmTLxZEjTVNAV1fL6Y9MgABUOA+6vtnv4fc/q2d 4sFBA2LubjNjwg7wxy0Sjp+JtbdxKUYg4CuQgGO6bK25vjkwMvQwvAev57DSBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514363; a=rsa-sha256; cv=none; b=yvN4/fngpXBPBT2w+G4DQD6HLi47gEDd/HWoRyHN+aElk0qtWcu/aqd4oOaJ8GB02TClLW kLjmf91p2cwDGJCG4N0K43Tr8br1uTosP99a8gwS6jooGd0DfcE5//r5ctO5xcCqpw1Odi H8Q0l8B8BOqAdNYajHUjiuk04d40yNpgD9ety/kYPTdRSt5ItHDZaquD359XMLpBKI2USn MdUKW2Haj/1tT4PWTY+pQrvWDqv+HUUlQoPnA9mz76G92R2XNGVpgviJycQatbQjzv2EuE TCeJJcPJ57VkEXM4jOjKh7t2pfnfJA+S0q7kVueDs7DnOjHDGYaQTUoDxjeamw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=td4trl1KOrL/DQ7us4uHW5h8bcX+8W5uwzWpWL2hPoA=; b=gm8At6GKaHa3nMDhMu2Osf3VblXJsQOwTTcYGBlHJ3wtUoDuUBt5eWUXEozCG4FnOpMsG3 Zd+b+5j9uSEhXb+ENHIBB7X8UtLGZY1NU9vvIJWsJfEkOJ9yo0pPgj0vOS7NKeS7mROhdX uoYE4/bswG4WMNlblnySlDZ+UiLSdEkjxNY4078WIac2LioH2IarKqabZGbo6eJs6K9CxA MI78x5z54v8BcQnoszMWh6EMxfdQlVd/ovFQ2d11JHo17Cm5KyFYVuNBmw1aVifjjdkbHW AOzzfP5KAwEf6vaG00ADXZzzi54bq+SSnlJWuUUgGWuxNdDfPcTCfK231qUT0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvb0FNdzm6; Mon, 25 Dec 2023 14:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ27d023891; Mon, 25 Dec 2023 14:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ2QU023888; Mon, 25 Dec 2023 14:26:02 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:02 GMT Message-Id: <202312251426.3BPEQ2QU023888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: ea7b13771cc9 - main - lib/libc/amd64/string: implement strncat() by calling strlen(), memccpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990 commit ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990 Author: Robert Clausecker AuthorDate: 2023-12-04 17:32:49 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:48 +0000 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 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncat.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index b569d2cb8be8..a14e8a768f01 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 000000000000..33b278ac5e04 --- /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 + +#include + +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); +}