From nobody Sun Aug 3 00:58:01 2025 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 4bvhBL2c3Bz63nBZ; Sun, 03 Aug 2025 00:58:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bvhBL1N5Kz46jG; Sun, 03 Aug 2025 00:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754182682; 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=MOKueup9rnWOJeLReGwdayWrVe/1BEPo575cHaVgMxk=; b=J9susMmX17cXD6ueqIIvW2+aMW0L/fgAu143Rtp3wCnSypxDAI8g9WEYC/n6mZshwB7+im J3ebUjkBaiPpqGKu2X3oMPCJHOKNhFsOras0TAz4iH7dNiF/pvfsMsKWctLrL54+au2H+0 AN+rrOy/XQqQ8C3L5ycxwn1wdgimGWImFUEfO0Y3stzMxuWYfHLw/S6+EfHwDSOTnAP+x7 eGFX0y3pkkyDjgSsubC9pTjFUh9vtUWkEqpZrC5sUAeFOwDrV2YrCjwsPC6YFaptfiT/tv /zFUq0Eg1z3xmihBaMjHsRL75GhgIlL5zmKlpRwxVPukzhLFN1NtpXhNjIeKHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754182682; 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=MOKueup9rnWOJeLReGwdayWrVe/1BEPo575cHaVgMxk=; b=Te47B5krVEXK1R6o2tVkzUTax/HY+zlkIGwcWdtcT10uLsbQVwjqMzuNgIwN/o8tmSim/3 yZJgVAaW7gfmwcbSeIK0VRidDD8IFFZN6idrz7d0ZSz2ycSmNokurNM4iBX62soFwdmPSX TLE+czO0fKQDJFn1aPBqOOE9dxy42DVR3xayvumBx9aYNsqQ+iPYGC2K4qN0OGe73YaiCi wJ6/o9PA3ZMlm1HBRv2WBAayRqQDADG4l3NRVz5QBoniWZB/AbopUjsfRiZVrSogChjjva y/3/rO3bWVnMgFLgRAVApjyye0nvAAJ2KeCm//IHELy3JrteWtxYfPpH8kJ9eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754182682; a=rsa-sha256; cv=none; b=yg0dPnziVA72NOF+3K1CY2gXu+UF/yM6AN5z/xrvkYnTO66Wg7X2dMACJid2sk7djxQgms 7BNcy03HzkWS5ZbDHT1fgFv1NMtKn6W7DeymzEGasvM8vGyq32r5vRiB6O4apc4ag9smmT m3BU0b5bvX4m3ggcEumWmi1wQYC+CjvCGp5kcCmVSq1T/3ItR4xTqNW6rudfYfZ9oDx4VB rvtyMNm8zdaRHlKdg1s27OXYAl/0fd4FO+DJap3WaCydPvXwu8SF3vXNQkivR+epbn4Yo7 XZGLhbQyF7CbhANncB+vof4vAl7UQU2zxuIwBLnP3IeS/DwFh8CKMzAhahWUpA== 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 4bvhBL0RFFzhgC; Sun, 03 Aug 2025 00:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5730w1er056823; Sun, 3 Aug 2025 00:58:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5730w16t056820; Sun, 3 Aug 2025 00:58:01 GMT (envelope-from git) Date: Sun, 3 Aug 2025 00:58:01 GMT Message-Id: <202508030058.5730w16t056820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 7f41c76b84d0 - stable/14 - MFC: MFV: less v679. 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f41c76b84d0f24feb7d60bc566630735dbc78e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=7f41c76b84d0f24feb7d60bc566630735dbc78e3 commit 7f41c76b84d0f24feb7d60bc566630735dbc78e3 Author: Xin LI AuthorDate: 2025-07-20 17:33:52 +0000 Commit: Xin LI CommitDate: 2025-08-03 00:55:19 +0000 MFC: MFV: less v679. (cherry picked from commit 76bafc90692608c1db8df3276e966212201c270c) --- contrib/less/NEWS | 10 ++++++++++ contrib/less/decode.c | 2 +- contrib/less/help.c | 2 +- contrib/less/less.h | 9 +++++---- contrib/less/less.nro | 2 +- contrib/less/lessecho.nro | 2 +- contrib/less/lesskey.nro | 2 +- contrib/less/os.c | 6 +++--- contrib/less/version.c | 4 +++- 9 files changed, 26 insertions(+), 13 deletions(-) diff --git a/contrib/less/NEWS b/contrib/less/NEWS index 5767ded21a00..cdc8196a5f16 100644 --- a/contrib/less/NEWS +++ b/contrib/less/NEWS @@ -9,6 +9,16 @@ Report bugs, suggestions or comments at https://github.com/gwsw/less/issues. +====================================================================== + + Major changes between "less" versions 678 and 679 + +* Fix bad parsing of lesskey file an env var is a prefix of another + env var (github #626). + +* Fix unexpected exit using -K if a key press is received while reading + the input file (github #628). + ====================================================================== Major changes between "less" versions 668 and 678 diff --git a/contrib/less/decode.c b/contrib/less/decode.c index 2942a30863cb..8e451d1810c9 100644 --- a/contrib/less/decode.c +++ b/contrib/less/decode.c @@ -750,7 +750,7 @@ static int cmd_search(constant char *cmd, constant unsigned char *table, constan { action = taction; *extra = textra; - } else if (match > 0) /* cmd is a prefix of this table entry */ + } else if (match > 0 && action == A_INVALID) /* cmd is a prefix of this table entry */ { action = A_PREFIX; } diff --git a/contrib/less/help.c b/contrib/less/help.c index 81e0943fe4e2..5d8ba9a1b0fe 100644 --- a/contrib/less/help.c +++ b/contrib/less/help.c @@ -1,4 +1,4 @@ -/* This file was generated by mkhelp.pl from less.hlp at 20:41 on 2025/5/1 */ +/* This file was generated by mkhelp.pl from less.hlp at 19:46 on 2025/5/28 */ #include "less.h" constant char helpdata[] = { '\n', diff --git a/contrib/less/less.h b/contrib/less/less.h index 94a3e2235906..7b2d2c25bfc6 100644 --- a/contrib/less/less.h +++ b/contrib/less/less.h @@ -575,10 +575,11 @@ typedef enum { #endif #endif -#define S_INTERRUPT 01 -#define S_STOP 02 -#define S_WINCH 04 -#define ABORT_SIGS() (sigs & (S_INTERRUPT|S_STOP)) +#define S_INTERRUPT (1<<0) +#define S_SWINTERRUPT (1<<1) +#define S_STOP (1<<2) +#define S_WINCH (1<<3) +#define ABORT_SIGS() (sigs & (S_INTERRUPT|S_SWINTERRUPT|S_STOP)) #ifdef EXIT_SUCCESS #define QUIT_OK EXIT_SUCCESS diff --git a/contrib/less/less.nro b/contrib/less/less.nro index 6b74ec5f161b..25a9869a9c59 100644 --- a/contrib/less/less.nro +++ b/contrib/less/less.nro @@ -1,5 +1,5 @@ '\" t -.TH LESS 1 "Version 678: 01 May 2025" +.TH LESS 1 "Version 679: 28 May 2025" .SH NAME less \- display the contents of a file in a terminal .SH SYNOPSIS diff --git a/contrib/less/lessecho.nro b/contrib/less/lessecho.nro index 696fcb13b214..f0cccc4de6da 100644 --- a/contrib/less/lessecho.nro +++ b/contrib/less/lessecho.nro @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 678: 01 May 2025" +.TH LESSECHO 1 "Version 679: 28 May 2025" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro index 61ba056b04c6..0a17c9deff71 100644 --- a/contrib/less/lesskey.nro +++ b/contrib/less/lesskey.nro @@ -1,5 +1,5 @@ '\" t -.TH LESSKEY 1 "Version 678: 01 May 2025" +.TH LESSKEY 1 "Version 679: 28 May 2025" .SH NAME lesskey \- customize key bindings for less .SH "SYNOPSIS (deprecated)" diff --git a/contrib/less/os.c b/contrib/less/os.c index 98a7ecf70c3c..357cbb356a16 100644 --- a/contrib/less/os.c +++ b/contrib/less/os.c @@ -275,7 +275,7 @@ start: if (ret != 0) { if (ret == READ_INTR) - sigs |= S_INTERRUPT; + sigs |= S_SWINTERRUPT; reading = FALSE; return (ret); } @@ -287,7 +287,7 @@ start: int c; c = WIN32getch(); - sigs |= S_INTERRUPT; + sigs |= S_SWINTERRUPT; reading = FALSE; if (c != CONTROL('C') && c != intr_char) WIN32ungetch((char) c); @@ -348,7 +348,7 @@ public int iopen(constant char *filename, int flags) while (!opening && SET_JUMP(open_label)) { opening = FALSE; - if (sigs & S_INTERRUPT) + if (sigs & (S_INTERRUPT|S_SWINTERRUPT)) { sigs = 0; #if HAVE_SETTABLE_ERRNO diff --git a/contrib/less/version.c b/contrib/less/version.c index 9a97f1658940..68a42a6272fa 100644 --- a/contrib/less/version.c +++ b/contrib/less/version.c @@ -1047,6 +1047,8 @@ v675 4/3/25 Add ESC-b. v676 4/16/25 Fix two OSC 8 display bugs. v677 4/27/25 Fix & filtering bug. v678 5/1/25 Don't change stty tab setting. +v679 5/28/25 Fix lesskey parsing bug when env var is prefix of another; + fix unexpected exit when using -K. */ -char version[] = "678"; +char version[] = "679";