From owner-p4-projects@FreeBSD.ORG  Wed Jul  9 09:50:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B84A71065675; Wed,  9 Jul 2008 09:50:11 +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 7B145106566C
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 09:50:11 +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 6CA048FC15
	for <perforce@freebsd.org>; Wed,  9 Jul 2008 09:50:11 +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 m699oB2c034699
	for <perforce@freebsd.org>; Wed, 9 Jul 2008 09:50:11 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m699oBQm034697
	for perforce@freebsd.org; Wed, 9 Jul 2008 09:50:11 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 9 Jul 2008 09:50:11 GMT
Message-Id: <200807090950.m699oBQm034697@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 144934 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:50:12 -0000

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

Change 144934 by gabor@gabor_server on 2008/07/09 09:50:00

	- Clean up the wflag part

Affected files ...

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

Differences ...

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

@@ -240,35 +240,18 @@
 					if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len)
 						r = REG_NOMATCH;
 				if (r == 0 && wflag) {
-					char	*begin, *end;
-					wchar_t	*wbegin, *wend;
-					size_t	size;
+					wchar_t	*wbegin;
+					wint_t	 wend;
 
-					begin = grep_malloc(sizeof(char) * (pmatch.rm_so + 1));
-					end = grep_malloc(sizeof(char) * (strlen(l->dat) - pmatch.rm_eo));
-					strlcpy(begin, l->dat, pmatch.rm_so);
-					strlcpy(end, &(l->dat[pmatch.rm_eo]), (strlen(l->dat) - pmatch.rm_eo));
-
-					size = mbstowcs(NULL, begin, 0);
-					wbegin = grep_malloc(sizeof(wint_t) * size);
-					if (mbstowcs(wbegin, begin, size) == -1) {
+					wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so));
+					if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1)
 						r = REG_NOMATCH;
-						continue;
-					}
-					free(begin);
-					size = mbstowcs(NULL, end, 0);
-					wend = grep_malloc(sizeof(wint_t) * size);
-					if (mbstowcs(wend, end, size) == -1) {
-						r = REG_NOMATCH;
-						continue;
-					}
-					free(end);
 
-					if ((pmatch.rm_so != 0 && iswword(wbegin[wcslen(wbegin -1)]))
-					    || (pmatch.rm_eo != l->len && iswword(wend[0])))
+					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);
-					free(wend);
 				}
 				if (r == t) {
 					if (m == 0)