From nobody Thu Feb 19 09:14:53 2026 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 4fGnlK4ZcCz6Scjd for ; Thu, 19 Feb 2026 09:14: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGnlK2VClz42y4 for ; Thu, 19 Feb 2026 09:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492493; 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=GWQruX/lzAgOhD6c0P0D473rbYzjW55lH+l2nNScXRc=; b=wkl2OAvUk4OiSTGVGAT9dZ/vNEv09rBkXe0VknA2vSdemQTakfpfFZ7YKz0uLPXVNRrf5y qizmzBNuTnKbvwKvlnm+t55oLgSjN/Ds1VnY3UQruHbEReFkjiJrz8iOu5luyFDEmnO5Pl 8Xu/ZS6tUYKDk56v/hjy8+Vye7rXLaZY0AsO6WX3AWALkLs0/kG/5xbxXp0E0LYAmNoaHq oAQzWOtP2h26piS9PR7HXwYWRFY4cLF0seaC8BKxpjyd5dg/zDf1txQxYHSKZQyqHaLlIb zKWkHuSXY8K8RaA5gdAHB0zMnROVs2ANAMRKIyac9Dg4F5ftPgxNEU9I6xrbKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492493; a=rsa-sha256; cv=none; b=GJ0kkBt3Vxou0zFz0Z7mxJWYrQcpWx7wTeiBdUdViC3X8QE/xXWVm9wXbEoOrzLsm1xu80 UI9ovVcOsM61/TQLLSXaLSks/OXiG8mHGU2aTHtbyWqKVdNEiUPcvpC06h3Xavw9o/JaYZ 7+MhL0rHwzMZRNPZETWEZJI/0ZOTx8j4MYfJFpkSdQEFB27px1RBzORt4lCxIx0ffw6ExS Hn6hO/QaJ151CzdInW5aYBkRMNXxVTCsarLtbmoXgzUDfRjGjZQb1GJ5rVTs3QYfD1MtcM nC/apvoQqBd5AVvVUkL0amCRunkCOP/UpOq7+ZIUwHFpuQLEv3sq44ENT3UfKA== 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=1771492493; 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=GWQruX/lzAgOhD6c0P0D473rbYzjW55lH+l2nNScXRc=; b=Fm9Q6dllT8jlos54+9WI4bLajue3a0VOcefa47/ZuBcGmhjlEVHkVP7DORJ9T2r4Eb4Sm3 cnPecbqj+PEuCnVMuOSFc7AOE2UQfN4SjdlR8Ijfl0Dk1O9nvuehGzfGRP0FKb1hWECvOz HcXjRxU2jMPmHjkGyGFezHGOf1XtZIUNxGNtH/XHTOBC6eGEo8tPiYqV7orDZQlhpv7DFs 4+D8XIaMiV2AkUPjeM6b6ps7xvr3ZXnhylyu6pB1+5SHjoAICF1D+C5XChZ9pcIn7lbRvv U3pLNxmvi/MOJuV4E2tZJZpsFzkGFZwdWn/dmmlMs23AiWD9mFcjP0LeU0BB9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnlK1pp2zbyF for ; Thu, 19 Feb 2026 09:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e011 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:14:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 45d84c2f06fa - stable/14 - tr: fix class handling in unicode world 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 45d84c2f06fa72e405f09e2468b10bdf10b806cf Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:14:53 +0000 Message-Id: <6996d48d.1e011.58b40d00@gitrepo.freebsd.org> The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=45d84c2f06fa72e405f09e2468b10bdf10b806cf commit 45d84c2f06fa72e405f09e2468b10bdf10b806cf Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:14:42 +0000 tr: fix class handling in unicode world toupper/tolower logic was only handled for CCLASS_TOUPPER and CCLASS_TOLOWER, add support for CCLASS ([:alpha:]) PR: 219900 MFC After: 1 week (cherry picked from commit 625dc44832cd760be3d7242d8e21a530c7e32bfc) --- usr.bin/tr/tr.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 75638d6b3bc6..0eb9003ff831 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -253,6 +253,40 @@ main(int argc, char **argv) break; } while (s2.state == CCLASS_LOWER && s2.cnt > 1); goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_UPPER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towupper(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswupper(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip upper set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_UPPER && s2.cnt > 1); + goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_LOWER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towlower(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswlower(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip lower set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_LOWER && s2.cnt > 1); + goto again; } else { cmap_add(map, s1.lastch, s2.lastch); if (sflag)