From owner-svn-src-head@freebsd.org  Tue Apr  4 14:17:51 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 75171D2DA81;
 Tue,  4 Apr 2017 14:17:51 +0000 (UTC)
 (envelope-from emaste@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 454A4C80;
 Tue,  4 Apr 2017 14:17:51 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v34EHooa010716;
 Tue, 4 Apr 2017 14:17:50 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v34EHo3h010715;
 Tue, 4 Apr 2017 14:17:50 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201704041417.v34EHo3h010715@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 4 Apr 2017 14:17:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316491 - head/usr.bin/grep
X-SVN-Group: head
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: Tue, 04 Apr 2017 14:17:51 -0000

Author: emaste
Date: Tue Apr  4 14:17:50 2017
New Revision: 316491
URL: https://svnweb.freebsd.org/changeset/base/316491

Log:
  bsdgrep: revert color changes from r316477
  
  r316477 changed the color output to match exactly the in-tree GNU grep,
  but introduces unnecessary escape sequences.
  
  Submitted by:	Kyle Evans <kevans91 at ksu.edu>
  Reported by:	ache
  MFC after:	1 month
  MFC with:	r316477

Modified:
  head/usr.bin/grep/util.c

Modified: head/usr.bin/grep/util.c
==============================================================================
--- head/usr.bin/grep/util.c	Tue Apr  4 13:41:50 2017	(r316490)
+++ head/usr.bin/grep/util.c	Tue Apr  4 14:17:50 2017	(r316491)
@@ -512,13 +512,13 @@ printline(struct str *line, int sep, reg
 				fwrite(line->dat + a, matches[i].rm_so - a, 1,
 				    stdout);
 			if (color) 
-				fprintf(stdout, "\33[%sm", color);
+				fprintf(stdout, "\33[%sm\33[K", color);
 
 				fwrite(line->dat + matches[i].rm_so, 
 				    matches[i].rm_eo - matches[i].rm_so, 1,
 				    stdout);
 			if (color) 
-				fprintf(stdout, "\33[00m\33[K");
+				fprintf(stdout, "\33[m\33[K");
 			a = matches[i].rm_eo;
 			if (oflag)
 				putchar('\n');