From nobody Thu Feb 19 19:28:28 2026 X-Original-To: dev-commits-src-branches@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 4fH3MJ6jgxz6SJyd for ; Thu, 19 Feb 2026 19:28:28 +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 4fH3MJ597Qz3ZPY for ; Thu, 19 Feb 2026 19:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771529308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=baQ14CR9fSHtDfUQ1GatN5XXPB8PYrF7ryBVHoZhE9I=; b=yYKS3iRtEk+YTnDYCuahwUsO0TRc/C2muFUSqpha53XYzXx7ETngg56aDi09C4OCqnXo7V YwF/ry+9UahwpbvkzoCKBS86FueMiuN6yHJZwMj4kSXeGKGbf3hOXwCBou/Zb8QveTZxbT Y6vj9mj8XfjVgnnIAhrzM1zonfGzloVmPwbwaxZXKGrnMy/tzZxbzj9nd4xOuU1PxiZIxG BSQg5dHTtygil30oMj1bOJxwQNfH1oV2WfLeBAvQLJRCupD3OCqfdA17Dn+07MDg742lH9 T5atUjyr42sRmzgyWYg1eEt5VXgTPZMX37dLmChZ6eDUZ+Ctaq2rwaQMDE2Kwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771529308; a=rsa-sha256; cv=none; b=O1Lm4NDu8ixCA4EkLtP0ZVLLwaUznsdItCG4G0DdDzMIo4mN2iaqq0MZJAaWp12x8+m+rC 4eBHAT6E4x9E7QdVSlhq2deFmVSPxTwZtHwtymofmqkVT8DWjOoGzcJL6jLtVE7P8ehhzy 1jogUa9GqyuP+G8g4oK5ySw8kl3VMaihXHCGD7UNKxF+m9HGWOnqr4EW/u3XO/J51Fi6IQ umKRfCK8Uxvol4EqEGFPn2Nwagt2u55CJbGteFpeq9s1ZHcLQ2l2ai2w+i6daTpA4Ah9xP o/DbB1P8V8RjANlY8arSWTqdEbzGi29bDE6qUinDOe9PNcDxLitUy8gjkzmWIA== 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=1771529308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=baQ14CR9fSHtDfUQ1GatN5XXPB8PYrF7ryBVHoZhE9I=; b=Qrx68763xjmtLec/Jst4ulYhTJQAdfDP1+bbJmHvU1LaMfnEa6atHqi9DyTB57dlE1Ur6T wHiLS0xcDl+6t3ZP9LDrylI31n0rEgBU5aWmszARf99c0uUkznlKYSaNq8U3n2v//flWxs utTUHrBJZuvBncrDirfUbZsKSirU3TZEC3HBHk2tg5HMpXj33Uwxp9R5+qUmH8KCDD3lRe ZFd4Ns80Y6vQuaXwPKRjvq1WG2J2KV3FjqZ29p0YCbpHaAl2GOWaP89tUjDeAgO8bjMW1R to5je/lBe6Fc85ktoroTgBKlHXrwHDEJhnfzkB5L3Vw4O1DgVS1dNWyBV+lIMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fH3MJ4c1xzvtl for ; Thu, 19 Feb 2026 19:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46362 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 19:28:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 65338ff41fcd - releng/14.4 - tr: fix class handling in unicode world List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 65338ff41fcd0deb125767f550961418ab03cd82 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 19:28:28 +0000 Message-Id: <6997645c.46362.7e99686@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=65338ff41fcd0deb125767f550961418ab03cd82 commit 65338ff41fcd0deb125767f550961418ab03cd82 Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Colin Percival CommitDate: 2026-02-19 19:22:24 +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) (cherry picked from commit 45d84c2f06fa72e405f09e2468b10bdf10b806cf) --- 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)