From: David Bremner <bremner@debian.org>
Date: Thu, 24 Nov 2011 20:02:41 +0000 (-0400)
Subject: CLI: update call to notmuch_help_command for new calling conventions.
X-Git-Tag: 0.10.1~4
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=879c2a57a07edd7a10bf1ef277aeb6a57fc9e300

CLI: update call to notmuch_help_command for new calling conventions.

When I changed the calling convention to pass in all but the zero-th
argument to subcommands, I missed this one call, resulting in a
segmentation fault.

As a bonus, the syntax "notmuch --help foo" is now equivalent to
"notmuch help foo".
---

diff --git a/notmuch.c b/notmuch.c
index 77973f80..d44ce9a0 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -621,7 +621,7 @@ main (int argc, char *argv[])
 	return notmuch (local);
 
     if (STRNCMP_LITERAL (argv[1], "--help") == 0)
-	return notmuch_help_command (NULL, 0, NULL);
+	return notmuch_help_command (NULL, argc - 1, &argv[1]);
 
     if (STRNCMP_LITERAL (argv[1], "--version") == 0) {
 	printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");