From owner-p4-projects@FreeBSD.ORG  Fri Jun 27 14:53:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1DE501065679; Fri, 27 Jun 2008 14:53:30 +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 D41701065678
	for <perforce@freebsd.org>; Fri, 27 Jun 2008 14:53:29 +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 D08598FC1A
	for <perforce@freebsd.org>; Fri, 27 Jun 2008 14:53:29 +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 m5RErTBJ038114
	for <perforce@freebsd.org>; Fri, 27 Jun 2008 14:53:29 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5RErT1l038112
	for perforce@freebsd.org; Fri, 27 Jun 2008 14:53:29 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 27 Jun 2008 14:53:29 GMT
Message-Id: <200806271453.m5RErT1l038112@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 144196 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: Fri, 27 Jun 2008 14:53:30 -0000

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

Change 144196 by gabor@gabor_server on 2008/06/27 14:52:45

	- Fix -w

Affected files ...

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

Differences ...

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

@@ -196,6 +196,8 @@
 	return (c);
 }
 
+#define isword(x)	(isalnum((unsigned char)(x)) || (x) == '_')
+
 static int
 procline(struct str *l, int nottext)
 {
@@ -219,7 +221,8 @@
 					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]))
+					if ((pmatch.rm_so != 0 && isword((unsigned char)l->dat[pmatch.rm_so - 1]))
+					    || (pmatch.rm_eo != l->len && isword((unsigned char)l->dat[pmatch.rm_eo])))
 						r = REG_NOMATCH;
 				if (r == t) {
 					if (m == 0)