From owner-p4-projects@FreeBSD.ORG  Wed Jun 25 15:19:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 845B51065670; Wed, 25 Jun 2008 15:19:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4562A1065673
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 15:19:43 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A3DA8FC23
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 15:19:43 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5PFJh5V011336
	for <perforce@freebsd.org>; Wed, 25 Jun 2008 15:19:43 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5PFJhLa011334
	for perforce@freebsd.org; Wed, 25 Jun 2008 15:19:43 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 25 Jun 2008 15:19:43 GMT
Message-Id: <200806251519.m5PFJhLa011334@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144099 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jun 2008 15:19:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=144099

Change 144099 by gabor@gabor_server on 2008/06/25 15:19:25

	- Reimplement -w
	- Fixes for --color

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/util.c#44 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#44 (text+ko) ====

@@ -220,6 +220,9 @@
 				if (r == 0 && xflag)
 					if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len)
 						r = REG_NOMATCH;
+				if (r == 0 && wflag)
+					if (pmatch.rm_so != 0 || !isspace(l->dat[pmatch.rm_so - 1]))
+						r = REG_NOMATCH;
 				if (r == t) {
 					if (m == 0)
 						c++;
@@ -336,11 +339,11 @@
 			if (!oflag)
 				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");
+				fprintf(stdout, "\33[00m\33[K");
 			a = matches[i].rm_eo;
 			if (oflag)
 				putchar('\n');
@@ -354,5 +357,4 @@
 		fwrite(line->dat, line->len, 1, stdout);
 		putchar('\n');
 	}
-
 }