From owner-svn-src-head@freebsd.org  Mon Jul  3 15:54:46 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 316259E9831;
 Mon,  3 Jul 2017 15:54:46 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F223D757AD;
 Mon,  3 Jul 2017 15:54:45 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v63Fsj7l074072;
 Mon, 3 Jul 2017 15:54:45 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v63Fsjvg074071;
 Mon, 3 Jul 2017 15:54:45 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201707031554.v63Fsjvg074071@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 3 Jul 2017 15:54:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320603 - head/bin/ed
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/bin/ed
X-SVN-Commit-Revision: 320603
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2017 15:54:46 -0000

Author: pfg
Date: Mon Jul  3 15:54:44 2017
New Revision: 320603
URL: https://svnweb.freebsd.org/changeset/base/320603

Log:
  ed(1): Allow the omission of one address in (.,.) and (.;.) address ranges
  
  With this patch, ",n" is an abbreviation for "1,n", ";n" abbreviates
  ".;n". The "n," and "n;" variants mean "n,n" and "n;n", respectively.
  Also, piping to a shell command does not count as a save, so don't reset
  the modified flag.
  
  Obtained from:	OpenBSD (CVS Rev. 1.58, 1.59)

Modified:
  head/bin/ed/main.c

Modified: head/bin/ed/main.c
==============================================================================
--- head/bin/ed/main.c	Mon Jul  3 15:34:21 2017	(r320602)
+++ head/bin/ed/main.c	Mon Jul  3 15:54:44 2017	(r320603)
@@ -350,7 +350,8 @@ next_addr(void)
 				ibufp++;
 				addr_cnt++;
 				second_addr = (c == ';') ? current_addr : 1;
-				addr = addr_last;
+				if ((addr = next_addr()) < 0)
+					addr = addr_last;
 				break;
 			}
 			/* FALLTHROUGH */
@@ -809,7 +810,7 @@ exec_command(void)
 		if ((addr = write_file(*fnp ? fnp : old_filename,
 		    (c == 'W') ? "a" : "w", first_addr, second_addr)) < 0)
 			return ERR;
-		else if (addr == addr_last)
+		else if (addr == addr_last && *fnp != '!')
 			modified = 0;
 		else if (modified && !scripted && n == 'q')
 			gflag = EMOD;