From: Dmitry Potapov <dpotapov@gmail.com>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: Git Mailing List <git@vger.kernel.org>,
Phil Lawrence <prlawrence@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 3/7] grep: --count over binary
Date: Fri, 14 May 2010 13:34:24 +0400 [thread overview]
Message-ID: <20100514093424.GA6212@dpotapov.dyndns.org> (raw)
In-Reply-To: <4BEC62F6.9050602@lsrfire.ath.cx>
On Thu, May 13, 2010 at 10:37:10PM +0200, René Scharfe wrote:
> The intent of showing the message "Binary file xyz matches" for
> binary files is to avoid annoying users by potentially messing up
> their terminals by printing control characters. In --count mode,
> this precaution isn't necessary.
>
> Display counts of matches if -c/--count was specified, even if -a
> was not given. GNU grep does the same.
It is also not necessary with '-l' and '-L' options. (At least, if
we follow GNU grep).
> --- a/grep.c
> +++ b/grep.c
> @@ -802,7 +802,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
>
> switch (opt->binary) {
> case GREP_BINARY_DEFAULT:
> - if (buffer_is_binary(buf, size))
> + if (!opt->count && buffer_is_binary(buf, size))
> binary_match_only = 1;
So, I believe it should be:
if (!opt->count && !opt->name_only && !opt->unmatch_name_only &&
buffer_is_binary(buf, size))
Dmitry
next prev parent reply other threads:[~2010-05-14 9:34 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 [this message]
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 ` [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=20100514093424.GA6212@dpotapov.dyndns.org \
--to=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=prlawrence@gmail.com \
--cc=rene.scharfe@lsrfire.ath.cx \
/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).