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 5/7] grep: continue case insensitive fixed string search after NUL chars
Date: Thu, 13 May 2010 22:39:33 +0200 [thread overview]
Message-ID: <4BEC6385.8000106@lsrfire.ath.cx> (raw)
In-Reply-To: <4BEC6211.2000309@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 4633b63..20a02a2 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 ad97720..1143903 100755
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -37,4 +37,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
next prev parent reply other threads:[~2010-05-13 20:39 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 ` René Scharfe [this message]
2010-05-13 20:40 ` [PATCH 6/7] grep: add regmatch(), a wrapper for REG_STARTEND handling René Scharfe
2010-05-13 20:41 ` [PATCH 7/7] grep: use regmatch() for line matching 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=4BEC6385.8000106@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).