From owner-svn-src-user@FreeBSD.ORG Tue Sep 20 13:04:53 2011 Return-Path: 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 2081B106564A; Tue, 20 Sep 2011 13:04:53 +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 10A988FC12; Tue, 20 Sep 2011 13:04:53 +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 p8KD4qNc029472; Tue, 20 Sep 2011 13:04:52 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8KD4q9g029470; Tue, 20 Sep 2011 13:04:52 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201109201304.p8KD4q9g029470@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 20 Sep 2011 13:04:52 +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: r225694 - user/gabor/tre-integration/contrib/tre/lib X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2011 13:04:53 -0000 Author: gabor Date: Tue Sep 20 13:04:52 2011 New Revision: 225694 URL: http://svn.freebsd.org/changeset/base/225694 Log: - Dot is not special when dealing with a literal pattern Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c Tue Sep 20 12:46:07 2011 (r225693) +++ user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c Tue Sep 20 13:04:52 2011 (r225694) @@ -1010,7 +1010,8 @@ fastcmp(const fastmatch_t *fg, const voi case STR_WIDE: /* Check dot */ - if (pat_wide[i] == TRE_CHAR('.') && (!escmap || !escmap[i]) && + if (fg->hasdot && pat_wide[i] == TRE_CHAR('.') && + (!escmap || !escmap[i]) && (!fg->newline || (str_wide[i] != TRE_CHAR('\n')))) continue; @@ -1021,7 +1022,8 @@ fastcmp(const fastmatch_t *fg, const voi break; default: /* Check dot */ - if (pat_byte[i] == '.' && (!escmap || !escmap[i]) && + if (fg->hasdot && pat_byte[i] == '.' && + (!escmap || !escmap[i]) && (!fg->newline || (str_byte[i] != '\n'))) continue;