From: "René Scharfe" <l.s.r@web.de>
To: Patrick Steinhardt <ps@pks.im>, git@vger.kernel.org
Subject: Re: [PATCH] grep: correctly initialize help-all option
Date: Thu, 09 Apr 2015 23:55:01 +0200 [thread overview]
Message-ID: <5526F535.4020407@web.de> (raw)
In-Reply-To: <1428586916-22679-1-git-send-email-ps@pks.im>
Am 09.04.2015 um 15:41 schrieb Patrick Steinhardt:
> The "help-all" option is being initialized with a wrong value.
> While being semantically wrong this can also cause a gcc
> segmentation fault on ARMv7 hardfloat platforms with a hardened
> toolchain. Fix this by initializing with the correct value.
Thanks for your report and patch. A few comments:
Sign-off? (See "Sign your work" in Documentation/SubmittingPatches)
> ---
> builtin/grep.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index abc4400..c0bf005 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
> PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
> OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
> N_("allow calling of grep(1) (ignored by this build)")),
> - { OPTION_CALLBACK, 0, "help-all", &options, NULL, N_("show usage"),
> + { OPTION_CALLBACK, 0, "help-all", &opt, NULL, N_("show usage"),
> PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
> OPT_END()
> };
help_callback() returns -1 immediately, IOW the value pointer is never
used anyway. So why does your change make a difference? *puzzled*
We could pass NULL instead, as in builtin/show-ref.c, which would make
it clear that the pointer is just a dummy.
Q: Why does the callback exist in the first place? A: parse_options()
handles -h and --help-all automatically by showing the list of available
options. This is good for most commands for consistency's sake, but bad
for commands that want to use -h for something else. That's why it can
be turned off with the flag PARSE_OPT_NO_INTERNAL_HELP, but that flag
disables the long option as well. It's added back by grep and show-ref
explicitly, to at least provide --help-all consistently across all commands.
We could solve this problem centrally by checking for -h and --help-all
only after looking through the struct option list supplied to
parse_options_step() instead of before and getting rid of the then
unneeded callbacks for --help-all in grep and show-ref. Are there any
downsides to that approach?
René
next prev parent reply other threads:[~2015-04-09 21:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-09 13:41 [PATCH] grep: correctly initialize help-all option Patrick Steinhardt
2015-04-09 19:45 ` Eric Sunshine
2015-04-09 19:59 ` [PATCH v2] " Patrick Steinhardt
2015-04-10 16:35 ` René Scharfe
2015-04-09 21:55 ` René Scharfe [this message]
2015-04-10 5:22 ` [PATCH] " Patrick Steinhardt
2015-04-10 16:34 ` René Scharfe
2015-04-11 0:34 ` Patrick Steinhardt
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=5526F535.4020407@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
/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).