From owner-dev-commits-src-branches@freebsd.org Sun Jul 18 01:09:19 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CAE8F661A43; Sun, 18 Jul 2021 01:09:19 +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 4GS6M34hg5z4YvH; Sun, 18 Jul 2021 01:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 891D21AB57; Sun, 18 Jul 2021 01:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16I19JnL091005; Sun, 18 Jul 2021 01:09:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I19J6R091004; Sun, 18 Jul 2021 01:09:19 GMT (envelope-from git) Date: Sun, 18 Jul 2021 01:09:19 GMT Message-Id: <202107180109.16I19J6R091004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Neel Chauhan Subject: git: 7accb4a33579 - stable/13 - libkern: import strnstr from libc MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7accb4a33579ad18e83e1b93b89248370346649d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 01:09:19 -0000 The branch stable/13 has been updated by nc (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=7accb4a33579ad18e83e1b93b89248370346649d commit 7accb4a33579ad18e83e1b93b89248370346649d Author: Greg V AuthorDate: 2021-07-15 00:52:32 +0000 Commit: Neel Chauhan CommitDate: 2021-07-18 01:08:24 +0000 libkern: import strnstr from libc Required for drm-kmod 5.6 (amdgpu). Reviewed by: bz, hselasky, nc Differential Revision: https://reviews.freebsd.org/D31131 (cherry picked from commit f39d9c91318569a1ab7507d46e15147f5fef659e) --- sys/conf/files | 1 + sys/sys/libkern.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 161b70880309..0f5944c93c9c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4090,6 +4090,7 @@ libkern/strncat.c standard libkern/strncmp.c standard libkern/strncpy.c standard libkern/strnlen.c standard +libkern/strnstr.c standard libkern/strrchr.c standard libkern/strsep.c standard libkern/strspn.c standard diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 3f8827de06c5..0c3489d4c206 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -186,6 +186,7 @@ int strncasecmp(const char *, const char *, size_t); int strncmp(const char *, const char *, size_t); char *strncpy(char * __restrict, const char * __restrict, size_t); size_t strnlen(const char *, size_t); +char *strnstr(const char *, const char *, size_t); char *strrchr(const char *, int); char *strsep(char **, const char *delim); size_t strspn(const char *, const char *);