From: Jani Nikula <jani@nikula.org>
Date: Sun, 8 Mar 2015 16:18:55 +0000 (+0200)
Subject: cli: add support for notmuch command --help
X-Git-Tag: 0.20~33
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2447f4c1192ac6a90fbddcce40008efb0b4a0ee6

cli: add support for notmuch command --help

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.
---

diff --git a/notmuch.c b/notmuch.c
index 1717e8b3..a5b2877a 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