From nobody Sat Feb 14 05:56:22 2026 X-Original-To: dev-commits-src-main@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 4fCdZZ5hfSz6Shg9 for ; Sat, 14 Feb 2026 05:56:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCdZZ2znyz4M8w for ; Sat, 14 Feb 2026 05:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771048582; 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=NM8wuCLDTXbN5ZF0qDLYkDxh21T9lpaF5UrMxpCKqQM=; b=XnpKNHobL4+FfzahlJ9qi6C9oAUt7AzYQEL6Q2InZ+O9eUUa8h7s+7dkNSJBhff1ZDFk+d yb7Dir2P5uUbTcESwfotnvm53H5+cLA3Bnn9+Pq4AYUW3HLbavMjpkrhdCXj6Tt6SZqqSs R7+CgsPUBKJnYzXBSpZUC84o0eOGxdEw+w+esJYBGWMmbjTyWnTRSFVe82ibCSTvSgm/EK 2hIWLpV4VezfKqJ3sVQbFaVkq2J9B+QpFlMSOcHhOKSm/SkzE6uSQgTVj9cCO9nWlXy5ob pK3b0kNwQbq0YkNpotzlEfvtWq9Rctc6BRwdOwdeFZSzfL4R2TrPfSGigLMsGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771048582; a=rsa-sha256; cv=none; b=m1WsI0BtBPOSDon+ZaOeXwXnjcRedNNoYEv+TZQV6IaREau22RnlM46QP/rBxk4vH8WBhV 26Yljj5TW74EjWPPJ+aD3KeyGYRsIxkvmmpnELweMAWITkdopilkn6AZDjbgsYwXgiRLBn PrHHw/eZteij/fWzpTzzjpPYx73QpAgw/Na9WTISNvSdM12GiBLydJ4a3B163//WkwTnFt Krn3jXsQTVJ7ojMEIQufTSOcVrZCicya3aRn1RqTIlTj1PY7J/ogewbY0lGyWnNwG+GWBx ENKuia5L5hvPu98FRUWk077qrf4Qu0g6LLV3riBFjzh42mKNwGDyjCi0s/dnxA== 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=1771048582; 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=NM8wuCLDTXbN5ZF0qDLYkDxh21T9lpaF5UrMxpCKqQM=; b=S2V8iqIoN/0qxmNBWcTLzg+vlaTsWV9oFEjdS7IpfZtQxAlRMeXYooMoJ07mmjfhgZuKtU blWol1bu87xPBSvylyMK1DithfjWBWpzCehVkWakW45JAfhYmP9dD57+CGkWD2IN4olmse 940mJl0PHfmuhIO6LWMX6BJ6Xbk1w9WCgBS/VcHr6Gt19i8LzS8jirOQQqQiW9DpG+IPeh RErmWBBEYOL3CtYjCinfpJNkQ0JYMlhU/BCZnTOCrpsgJkwNWAo3L/iwMNi/q1ZiTnbHCv S2+W/R57m8CGVtasQZSA9/RW1Ht3whXohCwslvcbBwakp68WvJgf4kkg1WE8rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCdZZ27m2zvxc for ; Sat, 14 Feb 2026 05:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Feb 2026 05:56:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 625dc44832cd - main - tr: fix class handling in unicode world List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 625dc44832cd760be3d7242d8e21a530c7e32bfc Auto-Submitted: auto-generated Date: Sat, 14 Feb 2026 05:56:22 +0000 Message-Id: <69900e86.31f93.7504efa8@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=625dc44832cd760be3d7242d8e21a530c7e32bfc commit 625dc44832cd760be3d7242d8e21a530c7e32bfc Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-14 05:56:00 +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 --- 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 d31a51a73542..75b7cd8be7c0 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -242,6 +242,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)