From nobody Thu Feb 19 09:13:25 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 4fGnjf0Zl9z6Sc9V for ; Thu, 19 Feb 2026 09:13:26 +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 4fGnjd60Rkz42MF for ; Thu, 19 Feb 2026 09:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771492405; 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=oLfdbySe30IJiOr0sQO971n0BMBbn4SQqIgMkOg5skE=; b=UcUN+uMb3sAE8Ll6awGt0YiTy32Y4+YpPuDx5R+kmaYA89838X8LuxMA1MvkTZMLSK95cE NfPemKWxGCaVJqC5iiQq4LpFi/R4t9YfqrFD1yzccDfqftdBjOvonuhbGi5Wo1Xt8gE0BM 2t3pskrR3+eaMlzz7hRVh4QdEwwOb4yUuT63LXQ2sfSY6FscmYO5u+KqTcHwTuC7evEr6O pxLXFi3wsSddfFcWYzyEJW8ym/ukASz7M3a+rgiQVQALVqgW0m8MO2TEZIfKUg6krzOaTg LWEQXMEvvozI4xdaINlpoo1I+k2wdUTwpLOG6NbkasZ3GZeGDrekVksEfLvUEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771492405; a=rsa-sha256; cv=none; b=FckoggL6jUUx1WGtkLWU5q3DZjEBHvyZLZ16rYGpDA1tmwB+r9L3nrVJdlQK3HeaKiBhNl mkDJNupT50NWP6yXmGuQ4Ol8UAsog5zGvua3BmyW8JdumykozeUPd8FxZhqSQ1DvfW5E/8 DJmOt1sLQP/SSf58eldITaDqhq/kmvz1MRHleW4v9BhfYMHPIRj0fV5DbBSV4hak0ZWf9f mwYfEX/3Bjfd2wikuLbOn5sAueakXmxZBS23Ej7e1+CSRwGZBJqQoknrmUxicuf+RkTWiL eFcB2HroCBIPZ+oebvetLBjEk4u7ByVhgqrvUvnfHN+p3dxM/2+4tCvqlZSFKA== 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=1771492405; 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=oLfdbySe30IJiOr0sQO971n0BMBbn4SQqIgMkOg5skE=; b=ThOhr/5hNUrfw4Bxf8sj1IfxTRsguRQnchho5kCr5gulAvUtaWrPycTJcX1htYyEwYExea +g7PoXzrsz4l93DyzWaFs7VsdxLXPvR8JmK9HJXm+VwGcPQ8qoe9pbJIAZOVu9GEO5v3He RojISpuVmfLNyQ0kFa7JASajQNi1HIWuR4NfWcxf6uQT9M4xJrNqcmuVdXlxgpEd4xyovp dZJCv59pfbSTHQDGOwCyhZSs9qYamKzR26+5qU4sHyt7cI7wY93GbY32/6tuXh7Wu0fyNu CSxOOTJRFuPPHWYRUgJpVL0aTN15tQvhVQa3I7hJioMPswv/962Gabo5gJLyDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGnjd5b2vzby8 for ; Thu, 19 Feb 2026 09:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1de4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 09:13:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a51ec1cc5a82 - stable/15 - 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a51ec1cc5a82d770a37f3c5cfef9ee48cc7eab47 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 09:13:25 +0000 Message-Id: <6996d435.1de4c.db819b5@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a51ec1cc5a82d770a37f3c5cfef9ee48cc7eab47 commit a51ec1cc5a82d770a37f3c5cfef9ee48cc7eab47 Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-19 09:13:19 +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 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)