From owner-p4-projects@FreeBSD.ORG  Wed Jul  9 09:55:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 243571065673; Wed,  9 Jul 2008 09:55:17 +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 DA4EC1065683
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 09:55: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 CBD1E8FC0C
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 09:55: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 m699tGJJ035125
	for <perforce@freebsd.org>; Wed, 9 Jul 2008 09:55:16 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m699tGl6035123
	for perforce@freebsd.org; Wed, 9 Jul 2008 09:55:16 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 9 Jul 2008 09:55:16 GMT
Message-Id: <200807090955.m699tGl6035123@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 144936 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 09:55:17 -0000

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

Change 144936 by gabor@gabor_server on 2008/07/09 09:54:33

	- Optimize the wflag part
	
	Suggested by:	fjoe

Affected files ...

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

Differences ...

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

@@ -243,15 +243,16 @@
 					wchar_t	*wbegin;
 					wint_t	 wend;
 
-					wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so));
-					if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1)
-						r = REG_NOMATCH;
+					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 ((pmatch.rm_so != 0 && iswword(wbegin[wcslen(wbegin)]))
-					    || (pmatch.rm_eo != l->len && iswword(wend)))
-						r = REG_NOMATCH;
-					free(wbegin);
+						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)