From nobody Mon Dec 25 14:25:56 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 4SzKvS4hWmz54nMk; Mon, 25 Dec 2023 14:25:56 +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 4SzKvS1sChz3Mtx; Mon, 25 Dec 2023 14:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514356; 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=dPu7Rn9BVezsMXQgZUrPis6xcon40Gx0SBBM3FAQ5Nc=; b=QgwwtChllhCW7gplwINVSfHGRg7JG+WqUBsn298vXTjTbRtwzwDQmF43Tnu7yZsj54wZ7L 3F4cillpp5I2fokrTvUDz0h2kusCQwD5vYq1C1yY1B6xoBV65NZT+CN7bULwaB36R/RKzv HuaugP2mPJELwgigyg0UvrszFL5PlhXH2LYcqTi4j3ITyplw7mD9go3/A9CxYUhBFxV4jI IVIx7y8v5vmYU5Fh4IUMsqORH7arrz1jGHeZn5QX/9pldSskeQtuxOcuq18jTAM+u9L353 hMkrw0T2M74g+zhjnNMaSbGyoWA98N2oDlyuUt3UeMAhpTedP5e8V35jNOHkVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514356; a=rsa-sha256; cv=none; b=T0/vrw300M+S39GK3wnaUf3kvzb+ZllOHmclimW7alQGUsCbQ5xrFpSP262R/F4pNEBl8S L1Sa7SkKnznltG4cyRYK3Lpk6LjLyc1zGoCfetBEffXmDRnroznNxSXIw7h9SuXjTTzDbs JO/o4ovMlzqgAVrefg1n2eEhckqGQ8aQ1OaqCu1wPrQGM3l8SBakQZimkkZwWttk7vpb+b C+JbK9YjK1wkPyvbPaIvtynWSXWSMT9g2yhWOy8tlidv615okxu0PdaOswrwUVBEbv2bNH M5wUCHENYuvT5NX+a5DJjdLa6keCdRz04mQr6MiqbrE/p11vLpLUAK07VwOITQ== 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=1703514356; 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=dPu7Rn9BVezsMXQgZUrPis6xcon40Gx0SBBM3FAQ5Nc=; b=bZRDEiLVZm+b1do3Wjm6AcOhCP50NqHUP1dtuc0rf9+h2UNnaPvA5FFU6ghbm9YX9lQ+Dh 7W506nTL452mucYkrijJ3vsbhSERLXSnve6742sKyqi8+W2OeG46lbb0VH2PLHb22y+3Zl hnnihFIUM0rxf2KzD99xjaKuNElhWJYhanxncqfkqYSJAOrCWfeuftrA4pzwjj+JragpoV ZYEkk6S9aAVVs157gq9pBzNYWwj7CLbj0l5PjvJRpPFCseyYWCLxY7OEozjUl5pc7C2LTN O087fK4sQPYsA0g2rfj64hhI+p1Vz3/967YA4xQbBXnckk4n5Pl8VhTrObo6ZA== 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 4SzKvS0ytGzm5; Mon, 25 Dec 2023 14:25:56 +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 3BPEPu0Z023594; Mon, 25 Dec 2023 14:25:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEPuRi023591; Mon, 25 Dec 2023 14:25:56 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:25:56 GMT Message-Id: <202312251425.3BPEPuRi023591@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: 2b7b03b7ae17 - main - lib/libc/amd64/string: implement strlcat() through strlcpy() 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: 2b7b03b7ae179db465c1ef19a5007f729874916a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=2b7b03b7ae179db465c1ef19a5007f729874916a commit 2b7b03b7ae179db465c1ef19a5007f729874916a Author: Robert Clausecker AuthorDate: 2023-11-29 02:32:28 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:31 +0000 lib/libc/amd64/string: implement strlcat() through strlcpy() This should pick up our optimised memchr(), strlen(), and strlcpy() when strlcat() is called. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strlcat.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 03bca498e116..2b1e276cb3da 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcmp.S \ strcpy.c \ strcspn.S \ + strlcat.c \ strlcpy.S \ strlen.S \ strncmp.S \ diff --git a/lib/libc/amd64/string/strlcat.c b/lib/libc/amd64/string/strlcat.c new file mode 100644 index 000000000000..0c1e1c5d05f7 --- /dev/null +++ b/lib/libc/amd64/string/strlcat.c @@ -0,0 +1,25 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include + +void *__memchr(const void *, int, size_t); +size_t __strlcpy(char *restrict, const char *restrict, size_t); + +size_t +strlcat(char *restrict dst, const char *restrict src, size_t dstsize) +{ + char *loc = __memchr(dst, '\0', dstsize); + + if (loc != NULL) { + size_t dstlen = (size_t)(loc - dst); + + return (dstlen + __strlcpy(loc, src, dstsize - dstlen)); + } else + return (dstsize + strlen(src)); +}