notmuch: Add support for a --help option.

Previously, only "notmuch help" worked while a call to "notmuch --help"
would just print a message telling the user to call "notmuch help".
Instead of the redirection, just support --help directly now.

diff --git a/notmuch.c b/notmuch.c
index 95f057eae21b2289df61cc373b354fe0885a07a6..3b743a903cf78ca4c48f60caef64eba5aee77f20 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -307,7 +307,9 @@ usage (FILE *out)
     command_t *command;
     unsigned int i;
 
-    fprintf (out, "Usage: notmuch <command> [args...]\n");
+    fprintf (out,
+            "Usage: notmuch --help\n"
+            "       notmuch <command> [args...]\n");
     fprintf (out, "\n");
     fprintf (out, "Where <command> and [args...] are as follows:\n");
     fprintf (out, "\n");
@@ -457,6 +459,9 @@ main (int argc, char *argv[])
     if (argc == 1)
        return notmuch (local);
 
+    if (STRNCMP_LITERAL (argv[1], "--help") == 0)
+       return notmuch_help_command (NULL, 0, NULL);
+
     for (i = 0; i < ARRAY_SIZE (commands); i++) {
        command = &commands[i];