From owner-p4-projects@FreeBSD.ORG  Wed Jul  9 14:52:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75BE1106567A; Wed,  9 Jul 2008 14:52:16 +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 39A141065675
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 14:52:16 +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 29D508FC1F
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 14:52:16 +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 m69EqFFJ079611
	for <perforce@freebsd.org>; Wed, 9 Jul 2008 14:52:15 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m69EqFuP079609
	for perforce@freebsd.org; Wed, 9 Jul 2008 14:52:15 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 9 Jul 2008 14:52:15 GMT
Message-Id: <200807091452.m69EqFuP079609@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 144945 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, 09 Jul 2008 14:52:16 -0000

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

Change 144945 by gabor@gabor_server on 2008/07/09 14:51:53

	- Merge two if's

Affected files ...

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

Differences ...

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

@@ -239,20 +239,17 @@
 				if (r == 0 && xflag)
 					if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len)
 						r = REG_NOMATCH;
-				if (r == 0 && wflag) {
+				if (r == 0 && wflag && pmatch.rm_so != 0 && pmatch.rm_eo != l->len) {
 					wchar_t	*wbegin;
 					wint_t	 wend;
 
-					if (pmatch.rm_so != 0 && pmatch.rm_eo != l->len) {
-						wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so));
-						if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1)
-							r = REG_NOMATCH;
-
-						wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend);
-						if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend))
-							r = REG_NOMATCH;
-						free(wbegin);
-					}
+					wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so));
+					if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1)
+						r = REG_NOMATCH;
+					wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend);
+					if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend))
+						r = REG_NOMATCH;
+					free(wbegin);
 				}
 				if (r == t) {
 					if (m == 0)