From owner-svn-src-user@FreeBSD.ORG  Wed Sep 14 13:09:06 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 33E1D1065675;
	Wed, 14 Sep 2011 13:09:06 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24CA58FC14;
	Wed, 14 Sep 2011 13:09:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8ED96Wr027784;
	Wed, 14 Sep 2011 13:09:06 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8ED96f3027782;
	Wed, 14 Sep 2011 13:09:06 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201109141309.p8ED96f3027782@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 14 Sep 2011 13:09:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225553 - user/gabor/grep/trunk/regex
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Sep 2011 13:09:06 -0000

Author: gabor
Date: Wed Sep 14 13:09:05 2011
New Revision: 225553
URL: http://svn.freebsd.org/changeset/base/225553

Log:
  - Fix anchoring

Modified:
  user/gabor/grep/trunk/regex/tre-fastmatch.c

Modified: user/gabor/grep/trunk/regex/tre-fastmatch.c
==============================================================================
--- user/gabor/grep/trunk/regex/tre-fastmatch.c	Wed Sep 14 12:55:52 2011	(r225552)
+++ user/gabor/grep/trunk/regex/tre-fastmatch.c	Wed Sep 14 13:09:05 2011	(r225553)
@@ -822,8 +822,8 @@ badpat:
       _SHIFT_ONE;
 
 #define _BOL_COND							\
-  ((j == 0) || ((type == STR_WIDE) ? tre_isspace(str_wide[j - 1]) :	\
-    isspace(str_byte[j - 1])))
+  ((j == 0) || ((type == STR_WIDE) ? (str_wide[j - 1] == TRE_CHAR('\n'))\
+				   : (str_byte[j - 1] == '\n')))
 
 /*
  * Checks BOL anchor and shifts one if match is not on a
@@ -834,9 +834,10 @@ badpat:
       _SHIFT_ONE;
 
 #define _EOL_COND							\
-  ((type == STR_WIDE) ?							\
-    ((j + fg->wlen == len) || tre_isspace(str_wide[j + fg->wlen])) :	\
-    ((j + fg->len == len) || isspace(str_byte[j + fg->wlen])))
+  ((type == STR_WIDE)							\
+    ? ((j + fg->wlen == len) ||						\
+		(str_wide[j + fg->wlen] == TRE_CHAR('\n')))		\
+    : ((j + fg->len == len) || (str_byte[j + fg->wlen] == '\n')))
 
 /*
  * Checks EOL anchor and shifts one if match is not on a