From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 12:09:50 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D17091065688; Sun, 11 Jan 2009 12:09:49 +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 8F4121065680
	for <perforce@freebsd.org>; Sun, 11 Jan 2009 12:09:49 +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 7CDE88FC18
	for <perforce@freebsd.org>; Sun, 11 Jan 2009 12:09:49 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BC9nCA071776
	for <perforce@freebsd.org>; Sun, 11 Jan 2009 12:09:49 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BC9nmd071774
	for perforce@freebsd.org; Sun, 11 Jan 2009 12:09:49 GMT
	(envelope-from gabor@freebsd.org)
Date: Sun, 11 Jan 2009 12:09:49 GMT
Message-Id: <200901111209.n0BC9nmd071774@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 155952 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: Sun, 11 Jan 2009 12:09:51 -0000

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

Change 155952 by gabor@gabor_server on 2009/01/11 12:09:16

	- Remove this weird boundary match part. Boundary matching is handled
	  in util.c.

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#77 edit

Differences ...

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

@@ -237,27 +237,9 @@
 	if (len > 0 && pat[len - 1] == '\n')
 		--len;
 	/* pat may not be NUL-terminated */
-	if (wflag && !(grepbehave == GREP_FIXED)) {
-		int bol = 0, eol = 0, extra;
-		if (pat[0] == '^')
-			bol = 1;
-		if (len > 0 && pat[len - 1] == '$')
-			eol = 1;
-		extra = (grepbehave == GREP_EXTENDED) ? 2 : 4;
-		pattern[patterns] = grep_malloc(len + 15 + extra);
-		snprintf(pattern[patterns], len + 15 + extra,
-		   "%s[[:<:]]%s%.*s%s[[:>:]]%s",
-		    bol ? "^" : "",
-		    (grepbehave == GREP_EXTENDED) ? "(" : "\\(",
-		    (int)len - bol - eol, pat + bol,
-		    (grepbehave == GREP_EXTENDED) ? ")" : "\\)",
-		    eol ? "$" : "");
-		len += 14 + extra;
-	} else {
-		pattern[patterns] = grep_malloc(len + 1);
-		memcpy(pattern[patterns], pat, len);
-		pattern[patterns][len] = '\0';
-	}
+	pattern[patterns] = grep_malloc(len + 1);
+	memcpy(pattern[patterns], pat, len);
+	pattern[patterns][len] = '\0';
 	++patterns;
 }