From nobody Fri Jan 17 19:17:40 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 4YZTyX5Lrbz5lLm6; Fri, 17 Jan 2025 19:17:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZTyX4t51z3rXl; Fri, 17 Jan 2025 19:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737141460; 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=qogC5z7Tc7zij/xi50bNvBE1HXvuJbJlAf2o2p78T7U=; b=QU16/YrwrJnlcIJilRWAgQF4nt+p6yMn0RPglvRJmV4f5OR4Ux4id3k2fgGlTBXG5SrWrx e4TBApfSUVCkMTsaBSOM5KfAPze8FyP7wSiJUKv2USZXvM/BLxj/vHAueX+KbCnIyZpGoC MFEPW8JLjYz5lZkr9F5WRR8UfY4l2dXNJ8EozSkrW2H9IKLWuTvcmwhWM/E9I8mCFyS+8D CPNG7FoqVQl5/Z/9dCXvQh8NhvpxLBiTLzeq6hJqI+uJsUxEIfHYvgvVEvcWrHs50DjM3t el+DKN3013e7ee+SUDpCZESP8mHwiOsJG/744LKDHbT9pN84lYnZt508Mdwnow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737141460; 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=qogC5z7Tc7zij/xi50bNvBE1HXvuJbJlAf2o2p78T7U=; b=Cf1FaFsOBJ4obIC3HNJ5FJBYxEyVX20Q/6w4plfpNXdHtoLNDVyopXiUkhanhbzEVtqACf hLUmxVaRi1XmFpl9Kysr3sJPDqIAMQm2+X8WX/cgV6v+mYLvTYG4KIFw3VRJ/s2zVvrtnT eNnLHx7tfhjZiUR+vc2eLx+KqrK7fzZS5CFBL0GjV9nFRmNWfubRtf2V41yz91E4Ubj+XE r5LeND8v9jX3eY6sTHa35mwAgUN2FLoU8hcTL+1MHJVJlzku514bOlQ4MaF4M3p9UMsJfx 06084ltu/apQEnha7RsghgffZ/TAduzlqPNKUa+n1gSurGPgX+hL9/IxUP8QZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737141460; a=rsa-sha256; cv=none; b=tBdRiD1vCMMVN6VHgQPWIN7DyI2eKfm5zGoF3QQoQSPBgUpiuofwpihW1GVBla830gZdRl ty7Wg3lceJycHz6on27AJASMc5wZ5yjGNllCxQIqmR+yFtWqUYw9BTbSAIOY7lvgXfWMSO CChoAzpWSvncJ01nqjoRfaNT8loL+9liUZ+HCEaP9SfUBWW0T6a7iXQ+CwX3yvFYjMcF+5 UGMFJVp21BwNMaj3gla5nfQO6YcSqehWhI0awpqrqqJjCYJujA1NSF4Buns2qv7aIuSRT3 EOAxPtLsTDPgLlhcvh8btr/YygNdlWx94EdLKY3GQxd3HVxfJaAizInHueNDuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZTyX4QMXzX1g; Fri, 17 Jan 2025 19:17:40 +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 50HJHejD011594; Fri, 17 Jan 2025 19:17:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HJHeLK011591; Fri, 17 Jan 2025 19:17:40 GMT (envelope-from git) Date: Fri, 17 Jan 2025 19:17:40 GMT Message-Id: <202501171917.50HJHeLK011591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5ea64bfc9a6f - stable/13 - sed: The change ("c") command should start a new cycle. 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5ea64bfc9a6f8582b952580c7cdf754e7ab4a078 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea64bfc9a6f8582b952580c7cdf754e7ab4a078 commit 5ea64bfc9a6f8582b952580c7cdf754e7ab4a078 Author: Valeriy Ushakov AuthorDate: 2024-12-17 22:27:01 +0000 Commit: Mark Johnston CommitDate: 2025-01-17 18:48:01 +0000 sed: The change ("c") command should start a new cycle. The "c" command should start the next cycle as clarified in POSIX 2024. This is also consistent with historical and gnu sed behavior. This patch is from OpenBSD by way of NetBSD with a tweak to the man page date by me. Confirmed the test case in the bug now works. PR: 271817 Obtained from: NetBSD (1.39 uwe), OpenBSD (1.39 millert) Sponsored by: Netflix (cherry picked from commit a2d78713171cf138b5ae50d61f82df1af7574c95) --- usr.bin/sed/process.c | 2 +- usr.bin/sed/sed.1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c index 945db462a601..e3f2bcab4881 100644 --- a/usr.bin/sed/process.c +++ b/usr.bin/sed/process.c @@ -137,7 +137,7 @@ redirect: psl = 0; if (cp->a2 == NULL || lastaddr || lastline()) (void)fprintf(outfile, "%s", cp->t); - break; + goto new; case 'd': pd = 1; goto new; diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1 index 29ede6d70230..90b23e2834de 100644 --- a/usr.bin/sed/sed.1 +++ b/usr.bin/sed/sed.1 @@ -30,7 +30,7 @@ .\" .\" @(#)sed.1 8.2 (Berkeley) 12/30/93 .\" -.Dd April 8, 2021 +.Dd December 17, 2024 .Dt SED 1 .Os .Sh NAME @@ -374,7 +374,7 @@ If the label is not specified, branch to the end of the script. .Pp .It [2addr]c\e .It text -Delete the pattern space. +Delete the pattern space and start the next cycle. With 0 or 1 address or at the end of a 2-address range, .Em text is written to the standard output.