From owner-dev-commits-src-main@freebsd.org Thu Jan 7 23:20:57 2021 Return-Path: Delivered-To: dev-commits-src-main@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 61D874DE8F6; Thu, 7 Jan 2021 23:20:53 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBj04361tz4ShT; Thu, 7 Jan 2021 23:20:52 +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 C208F19655; Thu, 7 Jan 2021 23:20:51 +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 107NKp7B063358; Thu, 7 Jan 2021 23:20:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 107NKpuv063357; Thu, 7 Jan 2021 23:20:51 GMT (envelope-from git) Date: Thu, 7 Jan 2021 23:20:51 GMT Message-Id: <202101072320.107NKpuv063357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: bc861033357e - main - libkern/strcasestr.c: Drop xlocale support and connect to build. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc861033357ef2d2eeaf5d85d70bb4b638961b2d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2021 23:20:57 -0000 The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=bc861033357ef2d2eeaf5d85d70bb4b638961b2d commit bc861033357ef2d2eeaf5d85d70bb4b638961b2d Author: Vladimir Kondratyev AuthorDate: 2020-10-06 14:50:52 +0000 Commit: Vladimir Kondratyev CommitDate: 2021-01-07 23:18:42 +0000 libkern/strcasestr.c: Drop xlocale support and connect to build. Reviewed by: markj, hselasky Differential revision: https://reviews.freebsd.org/D27866 --- sys/conf/files | 1 + sys/libkern/strcasestr.c | 22 ++++++++-------------- sys/sys/libkern.h | 1 + 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 0258fca24836..7cfb32560af6 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4058,6 +4058,7 @@ libkern/qsort_r.c standard libkern/random.c standard libkern/scanc.c standard libkern/strcasecmp.c standard +libkern/strcasestr.c standard libkern/strcat.c standard libkern/strchr.c standard libkern/strchrnul.c optional gdb diff --git a/sys/libkern/strcasestr.c b/sys/libkern/strcasestr.c index b70c2195a94e..c0418cfaeb3d 100644 --- a/sys/libkern/strcasestr.c +++ b/sys/libkern/strcasestr.c @@ -40,35 +40,29 @@ #include __FBSDID("$FreeBSD$"); -#include -#include -#include "xlocale_private.h" +#include +#include +#include /* * Find the first occurrence of find in s, ignore case. */ char * -strcasestr_l(const char *s, const char *find, locale_t locale) +strcasestr(const char *s, const char *find) { char c, sc; size_t len; - FIX_LOCALE(locale); if ((c = *find++) != 0) { - c = tolower_l((unsigned char)c, locale); + c = tolower((unsigned char)c); len = strlen(find); do { do { if ((sc = *s++) == 0) return (NULL); - } while ((char)tolower_l((unsigned char)sc, locale) != c); - } while (strncasecmp_l(s, find, len, locale) != 0); + } while ((char)tolower((unsigned char)sc) != c); + } while (strncasecmp(s, find, len) != 0); s--; } - return ((char *)s); -} -char * -strcasestr(const char *s, const char *find) -{ - return strcasestr_l(s, find, __get_locale()); + return (__DECONST(char *, s)); } diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 7385df139297..3874ef9ec4bd 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -168,6 +168,7 @@ void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, u_long random(void); int scanc(u_int, const u_char *, const u_char *, int); int strcasecmp(const char *, const char *); +char *strcasestr(const char *, const char *); char *strcat(char * __restrict, const char * __restrict); char *strchr(const char *, int); char *strchrnul(const char *, int);