All of lore.kernel.org
 help / color / mirror / Atom feed
From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Git Mailing List <git@vger.kernel.org>
Cc: Phil Lawrence <prlawrence@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 7/7] grep: use regmatch() for line matching
Date: Thu, 13 May 2010 22:41:15 +0200	[thread overview]
Message-ID: <4BEC63EB.2060307@lsrfire.ath.cx> (raw)
In-Reply-To: <4BEC6211.2000309@lsrfire.ath.cx>

Use regmatch() in match_one_pattern(), allowing regex matching
beyond NUL characters if regexec() supports the flag REG_STARTEND.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
---
 grep.c                 |    2 +-
 t/t7008-grep-binary.sh |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/grep.c b/grep.c
index 5be72cf..9dd2471 100644
--- a/grep.c
+++ b/grep.c
@@ -422,7 +422,7 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
 	if (p->fixed)
 		hit = !fixmatch(p->pattern, bol, eol, p->ignore_case, pmatch);
 	else
-		hit = !regexec(&p->regexp, bol, 1, pmatch, eflags);
+		hit = !regmatch(&p->regexp, bol, eol, pmatch, eflags);
 
 	if (hit && p->word_regexp) {
 		if ((pmatch[0].rm_so < 0) ||
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index 1143903..d8fde18 100755
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -41,4 +41,14 @@ test_expect_success 'git grep -Fi iLE a' '
 	git grep -Fi iLE a
 '
 
+# This test actually passes on platforms where regexec() supports the
+# flag REG_STARTEND.
+test_expect_failure 'git grep ile a' '
+	git grep ile a
+'
+
+test_expect_failure 'git grep .fi a' '
+	git grep .fi a
+'
+
 test_done
-- 
1.7.1

      parent reply	other threads:[~2010-05-13 20:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-13 20:33 [PATCH 0/7] grep: better support for binary files René Scharfe
2010-05-13 20:34 ` [PATCH 1/7] grep: add test script for binary file handling René Scharfe
2010-05-13 20:36 ` [PATCH 2/7] grep: refactor handling of binary mode options René Scharfe
2010-05-13 20:37 ` [PATCH 3/7] grep: --count over binary René Scharfe
2010-05-14  9:34   ` Dmitry Potapov
2010-05-16 17:45     ` René Scharfe
2010-05-13 20:38 ` [PATCH 4/7] grep: use memmem() for fixed string search René Scharfe
2010-05-13 20:39 ` [PATCH 5/7] grep: continue case insensitive fixed string search after NUL chars René Scharfe
2010-05-13 20:40 ` [PATCH 6/7] grep: add regmatch(), a wrapper for REG_STARTEND handling René Scharfe
2010-05-13 20:41 ` René Scharfe [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BEC63EB.2060307@lsrfire.ath.cx \
    --to=rene.scharfe@lsrfire.ath.cx \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=prlawrence@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.