[PATCH 1/2] cli: fix top level --help combined with other options

[PATCH 1/2] cli: fix top level --help combined with other options

[Jani Nikula]

If the top level --help is combined with other options, help
fails. For example:

    $ notmuch --version --help

    Sorry, --help is not a known command. There's not much I can do to help.

Fix this by adjusting argc and argv appropriately. The help command
ignores argv[0] anyway, so we don't have to set it to "help".
---
 notmuch.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/notmuch.c b/notmuch.c
index 0fac0997865e..1717e8b3683c 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -315,7 +315,13 @@ main (int argc, char *argv[])
     }
 
     if (print_help) {
-	ret = notmuch_help_command (NULL, argc - 1, &argv[1]);
+	/*
+	 * Pass the first positional argument as argv[1] so the help
+	 * command can give help for it. The help command ignores the
+	 * argv[0] passed to it.
+	 */
+	ret = notmuch_help_command (NULL, argc - opt_index + 1,
+				    argv + opt_index - 1);
 	goto DONE;
     }
 
-- 
2.1.4

[PATCH 2/2] cli: add support for notmuch command --help

[Jani Nikula]

Recognize 'notmuch command --help' at the top level as a special case,
and show help for the command. Note that for simplicity, --help is
only recognized as the first option for the subcommand.

---

Creeping featurism or useful? ISTR Mark wanted this.
---
 notmuch.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/notmuch.c b/notmuch.c
index 1717e8b3683c..a5b2877aee09 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -314,7 +314,9 @@ main (int argc, char *argv[])
 	goto DONE;
     }
 
-    if (print_help) {
+    /* Handle notmuch --help [command] and notmuch command --help. */
+    if (print_help ||
+	(opt_index + 1 < argc && strcmp (argv[opt_index + 1], "--help") == 0)) {
 	/*
 	 * Pass the first positional argument as argv[1] so the help
 	 * command can give help for it. The help command ignores the
-- 
2.1.4

Re: [PATCH 1/2] cli: fix top level --help combined with other options

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> -	ret = notmuch_help_command (NULL, argc - 1, &argv[1]);
> +	/*
> +	 * Pass the first positional argument as argv[1] so the help
> +	 * command can give help for it. The help command ignores the
> +	 * argv[0] passed to it.
> +	 */
> +	ret = notmuch_help_command (NULL, argc - opt_index + 1,
> +				    argv + opt_index - 1);
>  	goto DONE;
>      }

LGTM

Re: [PATCH 2/2] cli: add support for notmuch command --help

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> -    if (print_help) {
> +    /* Handle notmuch --help [command] and notmuch command --help. */
> +    if (print_help ||
> +	(opt_index + 1 < argc && strcmp (argv[opt_index + 1], "--help") == 0)) {

I like the feature, and I can live with the implementation. I'm reminded
that you once proposed a more sophisticated way of handling shared
arguments for subcommands, but that foundered on a reef of bikeshedding.

d

Re: [PATCH 1/2] cli: fix top level --help combined with other options

[Tomi Ollila]

On Mon, Mar 09 2015, David Bremner <david@tethera.net> wrote:

> Jani Nikula <jani@nikula.org> writes:
>
>> -	ret = notmuch_help_command (NULL, argc - 1, &argv[1]);
>> +	/*
>> +	 * Pass the first positional argument as argv[1] so the help
>> +	 * command can give help for it. The help command ignores the
>> +	 * argv[0] passed to it.
>> +	 */
>> +	ret = notmuch_help_command (NULL, argc - opt_index + 1,
>> +				    argv + opt_index - 1);
>>  	goto DONE;
>>      }
>
> LGTM

Also to me, too.

Tomi

Re: [PATCH 2/2] cli: add support for notmuch command --help

[Tomi Ollila]

On Mon, Mar 09 2015, David Bremner <david@tethera.net> wrote:

> Jani Nikula <jani@nikula.org> writes:
>
>> -    if (print_help) {
>> +    /* Handle notmuch --help [command] and notmuch command --help. */
>> +    if (print_help ||
>> +	(opt_index + 1 < argc && strcmp (argv[opt_index + 1], "--help") == 0)) {
>
> I like the feature, and I can live with the implementation. I'm reminded

This part above I agree :D

> that you once proposed a more sophisticated way of handling shared
> arguments for subcommands, but that foundered on a reef of bikeshedding.
>
> d

Tomi

Re: [PATCH 1/2] cli: fix top level --help combined with other options

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> If the top level --help is combined with other options, help
> fails. For example:
>
>     $ notmuch --version --help
>
>     Sorry, --help is not a known command. There's not much I can do to
>     help
pushed these two