All of lore.kernel.org
 help / color / mirror / Atom feed
From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 6/8] grep: continue case insensitive fixed string search after NUL chars
Date: Sat, 22 May 2010 23:34:06 +0200	[thread overview]
Message-ID: <4BF84DCE.1050407@lsrfire.ath.cx> (raw)
In-Reply-To: <4BF84B9E.7060009@lsrfire.ath.cx>

Functions for C strings, like strcasestr(), can't see beyond NUL
characters.  Check if there is such an obstacle on the line and try
again behind it.

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

diff --git a/grep.c b/grep.c
index c3affb6..b95803b 100644
--- a/grep.c
+++ b/grep.c
@@ -334,9 +334,15 @@ static int fixmatch(const char *pattern, char *line, char *eol,
 {
 	char *hit;
 
-	if (ignore_case)
-		hit = strcasestr(line, pattern);
-	else
+	if (ignore_case) {
+		char *s = line;
+		do {
+			hit = strcasestr(s, pattern);
+			if (hit)
+				break;
+			s += strlen(s) + 1;
+		} while (s < eol);
+	} else
 		hit = memmem(line, eol - line, pattern, strlen(pattern));
 
 	if (!hit) {
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index 9adc9ed..9660842 100755
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -55,4 +55,8 @@ test_expect_success 'git grep -F ile a' '
 	git grep -F ile a
 '
 
+test_expect_success 'git grep -Fi iLE a' '
+	git grep -Fi iLE a
+'
+
 test_done
-- 
1.7.1

  parent reply	other threads:[~2010-05-22 21:34 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-19 14:33 What's cooking extra Junio C Hamano
2010-05-19 15:12 ` A Large Angry SCM
2010-05-19 17:06 ` Finn Arne Gangstad
2010-05-19 20:09   ` Eyvind Bernhardsen
2010-05-22 13:09   ` Clemens Buchacher
2010-05-22 19:42     ` Eyvind Bernhardsen
2010-05-22 22:27       ` Clemens Buchacher
2010-05-23 10:36         ` Eyvind Bernhardsen
2010-05-23 11:51           ` Clemens Buchacher
2010-05-23 12:53             ` Eyvind Bernhardsen
2010-05-23 13:26               ` Ævar Arnfjörð Bjarmason
2010-05-24  9:49               ` Clemens Buchacher
2010-05-24 12:47                 ` Dmitry Potapov
2010-05-24 20:45                   ` Eyvind Bernhardsen
2010-05-24 20:56                   ` Clemens Buchacher
2010-05-24 21:09                     ` Eyvind Bernhardsen
2010-05-24 21:11                 ` Eyvind Bernhardsen
2010-05-24 22:11                   ` Clemens Buchacher
2010-05-25  6:41                     ` Eyvind Bernhardsen
2010-05-25  8:27                       ` Anthony Youngman
2010-06-07 19:55                         ` Eyvind Bernhardsen
2010-05-25  8:33                       ` Clemens Buchacher
2010-05-24 12:12             ` Dmitry Potapov
2010-05-24 12:22               ` Erik Faye-Lund
2010-05-24 12:42                 ` Dmitry Potapov
2010-05-21 16:16 ` Ævar Arnfjörð Bjarmason
2010-05-22 21:24 ` René Scharfe
2010-05-22 21:26   ` [PATCH 1/8] grep: add test script for binary file handling René Scharfe
2010-05-22 21:28   ` [PATCH 2/8] grep: grep: refactor handling of binary mode options René Scharfe
2010-05-22 21:29   ` [PATCH 3/8] grep: --count over binary René Scharfe
2010-05-22 21:30   ` [PATCH 4/8] grep: --name-only " René Scharfe
2010-05-22 21:32   ` [PATCH 5/8] grep: use memmem() for fixed string search René Scharfe
2010-05-22 21:34   ` René Scharfe [this message]
2010-05-22 21:35   ` [PATCH 7/8] grep: use REG_STARTEND for all matching if available René Scharfe
2010-05-22 21:43   ` [PATCH 8/8] grep: support NUL chars in search strings for -F René Scharfe

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=4BF84DCE.1050407@lsrfire.ath.cx \
    --to=rene.scharfe@lsrfire.ath.cx \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.