--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id BDCC46DE1978\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Apr 2015 00:19:37 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.268\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.268 tagged_above=-999 required=5 tests=[AWL=1.916, \r
+ DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,\r
+ RP_MATCHES_RCVD=-0.55, T_FREEMAIL_FORGED_FROMDOMAIN=0.01,\r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id xX9nkKyIzjhd for <notmuch@notmuchmail.org>;\r
+ Tue, 7 Apr 2015 00:19:35 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 04A036DE1974\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Apr 2015 00:19:34 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1YfNnC-0004o2-Kq; Tue, 07 Apr 2015 08:19:29 +0100\r
+Received: from 188.29.19.158.threembb.co.uk ([188.29.19.158] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1YfNnB-00065R-GX; Tue, 07 Apr 2015 08:19:26 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Bremner <david@tethera.net>, David Bremner <david@tethera.net>,\r
+ notmuch@notmuchmail.org\r
+Subject: Re: argument parsing refactoring, round 2\r
+In-Reply-To: <1428322958-2887-1-git-send-email-david@tethera.net>\r
+References: <87d23ixnr7.fsf@maritornes.cs.unb.ca>\r
+ <1428322958-2887-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.18.1+86~gef5e66a (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 07 Apr 2015 08:19:19 +0100\r
+Message-ID: <871tjws8w8.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-QM-SPAM-Info: 188.29.19.158 is in Janet mirror of Spamhaus XBL;\r
+ see http://www.spamhaus.org/xbl/\r
+X-Sender-Host-Address: 188.29.19.158\r
+X-QM-Geographic: According to ripencc,\r
+ this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 9e5abac1c37783f5f6ec2574cb490661 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -0.0 points.\r
+ Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider\r
+ * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 07 Apr 2015 07:19:37 -0000\r
+\r
+\r
+On Mon, 06 Apr 2015, David Bremner <david@tethera.net> wrote:\r
+> Thanks to Mark for pointing out on IRC that the previous version had problems linking the test suite helpers. That's fixed here by adding a couple stubs.\r
+>\r
+> Here's the diff, roughly with the previous version (actually the first\r
+> hunk is with a slightly later version, where I fixed one bug and\r
+> introduced another).\r
+\r
+Hi \r
+\r
+I like the shared options and the series in general. I have some very\r
+minor nits:\r
+\r
+The first is that I think you missed the second command in\r
+notmuch-search.c: i.e., notmuch_address_command so that doesn't respect\r
+these options. (You could either just add it there or to common_options\r
+if you prefer)\r
+\r
+The second is utterly trivial: is it worth having the shared options for\r
+help too? At the moment notmuch help --help just says "sorry --help is\r
+not a command".\r
+\r
+The other (very minor things) I will send in replies to the individual\r
+patches.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+>\r
+> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> index 568b3dc..f2cd6a8 100644\r
+> --- a/notmuch-config.c\r
+> +++ b/notmuch-config.c\r
+> @@ -885,9 +885,9 @@ notmuch_config_command (notmuch_config_t *config, int argc, char *argv[])\r
+> \r
+> notmuch_process_shared_options (argv[0]);\r
+> \r
+> - /* skip subcommand argument */\r
+> - argc-= opt_index+1;\r
+> - argv+= opt_index+1;\r
+> + /* skip at least subcommand argument */\r
+> + argc-= opt_index;\r
+> + argv+= opt_index;\r
+> \r
+> if (argc < 1) {\r
+> fprintf (stderr, "Error: notmuch config requires at least one argument.\n");\r
+> diff --git a/notmuch-setup.c b/notmuch-setup.c\r
+> index 5fc6e25..6a020dc 100644\r
+> --- a/notmuch-setup.c\r
+> +++ b/notmuch-setup.c\r
+> @@ -155,7 +155,7 @@ notmuch_setup_command (notmuch_config_t *config,\r
+> if (opt_index < 0)\r
+> return EXIT_FAILURE;\r
+> \r
+> - notmuch_process_shared_options (argv[0]);\r
+> + notmuch_process_shared_options ("setup");\r
+> \r
+> if (notmuch_config_is_new (config))\r
+> welcome_message_pre_setup ();\r
+> diff --git a/test/random-corpus.c b/test/random-corpus.c\r
+> index 790193d..6c467bb 100644\r
+> --- a/test/random-corpus.c\r
+> +++ b/test/random-corpus.c\r
+> @@ -114,6 +114,15 @@ random_utf8_string (void *ctx, size_t char_count)\r
+> return buf;\r
+> }\r
+> \r
+> +/* stubs since we cannot link with notmuch.o */\r
+> +const notmuch_opt_desc_t notmuch_shared_options[] = {\r
+> + { 0, 0, 0, 0, 0 }\r
+> +};\r
+> +\r
+> +void\r
+> +notmuch_process_shared_options (unused (const char *dummy))\r
+> +{\r
+> +}\r
+> \r
+> int\r
+> main (int argc, char **argv)\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff