From owner-svn-src-stable@freebsd.org  Wed Nov  9 18:00:51 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 40AF1C38A2B;
 Wed,  9 Nov 2016 18:00:51 +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 10931674;
 Wed,  9 Nov 2016 18:00:50 +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 uA9I0oTY093805;
 Wed, 9 Nov 2016 18:00:50 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA9I0oqB093789;
 Wed, 9 Nov 2016 18:00:50 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201611091800.uA9I0oqB093789@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: Wed, 9 Nov 2016 18:00:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r308472 - stable/11/usr.bin/sed
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Nov 2016 18:00:51 -0000

Author: pfg
Date: Wed Nov  9 18:00:50 2016
New Revision: 308472
URL: https://svnweb.freebsd.org/changeset/base/308472

Log:
  MFC r308314:
  sed(1): add LEGACY_BSDSED_COMPAT compile-time flag.
  
  In r297602, which included a __FreeBSD_version bump to 1100105, we changed
  sed 'i' and 'a' from discarding whitespaces to conform with what GNU and
  sysvish sed do.
  
  There are arguments in favor of keeping the old behavior but the new
  behavior is also useful for migration purposes. It seems important to at
  least consider the case of developers depending on the previous behavior
  so add a CFLAG to enable the old behavior.
  
  PR:		213474

Modified:
  stable/11/usr.bin/sed/compile.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/sed/compile.c
==============================================================================
--- stable/11/usr.bin/sed/compile.c	Wed Nov  9 17:57:55 2016	(r308471)
+++ stable/11/usr.bin/sed/compile.c	Wed Nov  9 18:00:50 2016	(r308472)
@@ -746,6 +746,9 @@ compile_text(void)
 	while (cu_fgets(lbuf, sizeof(lbuf), NULL)) {
 		op = s = text + size;
 		p = lbuf;
+#ifdef LEGACY_BSDSED_COMPAT
+		EATSPACE();
+#endif
 		for (esc_nl = 0; *p != '\0'; p++) {
 			if (*p == '\\' && p[1] != '\0' && *++p == '\n')
 				esc_nl = 1;