--- /dev/null
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9929C431FBC\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 14:28:48 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id PJQSSqbkpTsd for <notmuch@notmuchmail.org>;\r
+ Mon, 3 Dec 2012 14:28:48 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 048C7431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 14:28:47 -0800 (PST)\r
+X-AuditID: 12074425-b7f606d0000008ea-44-50bd279fa48e\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 1B.AA.02282.F972DB05; Mon, 3 Dec 2012 17:28:47 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qB3MSkBO032372; \r
+ Mon, 3 Dec 2012 17:28:47 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB3MSi65014301\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Mon, 3 Dec 2012 17:28:46 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TfeVI-00047r-GZ; Mon, 03 Dec 2012 17:28:44 -0500\r
+Date: Mon, 3 Dec 2012 17:28:44 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Jani Nikula <jani@nikula.org>\r
+Subject: Re: [PATCH 2/2] cli: convert "notmuch new" to the argument parser\r
+Message-ID: <20121203222844.GH1020@mit.edu>\r
+References:\r
+ <c4f2a1048763950dd14e13c99a4e7eb333be8c9d.1354568072.git.jani@nikula.org>\r
+ <e31ac6b2ceed533f8ac5386a010f4c052e09502e.1354568072.git.jani@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To:\r
+ <e31ac6b2ceed533f8ac5386a010f4c052e09502e.1354568072.git.jani@nikula.org>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hTV1p2vvjfAYOIrboum6c4W12/OZHZg\r
+ 8rh1/zW7x7NVt5gDmKK4bFJSczLLUov07RK4MubsDS14JllxoecMawPjKeEuRk4OCQETiRWP\r
+ XrFB2GISF+6tB7K5OIQE9jFKvNn9gwXCWc8osePJQkYI5wKTxN6V16DKljBKNH2ayQ7SzyKg\r
+ InH74UEmEJtNQENi2/7ljCC2iICixOaT+8FsZgFpiW+/m8FqhAW8JI68OwW2m1dAW+LKslZ2\r
+ iKELGSUONnUwQiQEJU7OfMIC0awlcePfS6BmDrBBy/9xgIQ5BcIkzrdOBJspCnTDlJPb2CYw\r
+ Cs1C0j0LSfcshO4FjMyrGGVTcqt0cxMzc4pTk3WLkxPz8lKLdC30cjNL9FJTSjcxgsKa3UV1\r
+ B+OEQ0qHGAU4GJV4eCfc2hMgxJpYVlyZe4hRkoNJSZRXSmJvgBBfUn5KZUZicUZ8UWlOavEh\r
+ RgkOZiUR3tfsQDnelMTKqtSifJiUNAeLkjjvjZSb/kIC6YklqdmpqQWpRTBZGQ4OJQneOjWg\r
+ RsGi1PTUirTMnBKENBMHJ8hwHqDhJSA1vMUFibnFmekQ+VOMilLivKwgCQGQREZpHlwvLO28\r
+ YhQHekWYVxSkigeYsuC6XwENZgIa/EJoN8jgkkSElFQDY7L3dZZm5v93b6hm3atRWjBj99dF\r
+ onL/rk8x7dxQGVV713a/Jv8Dkw0f2jVfLsmQff0+UfQZQ9YF39L9aQz6OTueHN+nsEZeT2j6\r
+ duNtBQrPzu3pnzqlZ2kZ46oWS3d1x8JXEb+uXN6wzPvYxP/zulTkqqeF/pDSOWwapPK11/3A\r
+ rtuG6mfnL1BiKc5INNRiLipOBABnzlOpFgMAAA==\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Mon, 03 Dec 2012 22:28:48 -0000\r
+\r
+LGTM. One minor nit below, but feel free to ignore it.\r
+\r
+Quoth Jani Nikula on Dec 03 at 10:56 pm:\r
+> Use the notmuch argument parser to handle arguments in "notmuch\r
+> new". As a side effect, this fixes broken STRNCMP_LITERAL usage that\r
+> accepts, for example, --verbosefoo for --verbose.\r
+> ---\r
+> notmuch-new.c | 38 +++++++++++++++++++-------------------\r
+> 1 file changed, 19 insertions(+), 19 deletions(-)\r
+> \r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index 718a538..feb9c32 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -36,8 +36,8 @@ typedef struct _filename_list {\r
+> \r
+> typedef struct {\r
+> int output_is_a_tty;\r
+> - int verbose;\r
+> - int debug;\r
+> + notmuch_bool_t verbose;\r
+> + notmuch_bool_t debug;\r
+> const char **new_tags;\r
+> size_t new_tags_length;\r
+> const char **new_ignore;\r
+> @@ -853,28 +853,28 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+> char *dot_notmuch_path;\r
+> struct sigaction action;\r
+> _filename_node_t *f;\r
+> + int opt_index;\r
+> int i;\r
+> notmuch_bool_t timer_is_active = FALSE;\r
+> - notmuch_bool_t run_hooks = TRUE;\r
+> + notmuch_bool_t no_hooks = FALSE;\r
+> \r
+> - add_files_state.verbose = 0;\r
+> - add_files_state.debug = 0;\r
+> + add_files_state.verbose = FALSE;\r
+> + add_files_state.debug = FALSE;\r
+> add_files_state.output_is_a_tty = isatty (fileno (stdout));\r
+> \r
+> - argc--; argv++; /* skip subcommand argument */\r
+> + notmuch_opt_desc_t options[] = {\r
+> + { NOTMUCH_OPT_BOOLEAN, &add_files_state.verbose, "verbose", 'v', 0 },\r
+> + { NOTMUCH_OPT_BOOLEAN, &add_files_state.debug, "debug", 'd', 0 },\r
+> + { NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 },\r
+\r
+Not that the single character arguments matter right now, but '-n' is\r
+often used for "dry-run", which could actually apply to notmuch new.\r
+\r
+> + { 0, 0, 0, 0, 0 }\r
+> + };\r
+> \r
+> - for (i = 0; i < argc && argv[i][0] == '-'; i++) {\r
+> - if (STRNCMP_LITERAL (argv[i], "--verbose") == 0) {\r
+> - add_files_state.verbose = 1;\r
+> - } else if (strcmp (argv[i], "--debug") == 0) {\r
+> - add_files_state.debug = 1;\r
+> - } else if (strcmp (argv[i], "--no-hooks") == 0) {\r
+> - run_hooks = FALSE;\r
+> - } else {\r
+> - fprintf (stderr, "Unrecognized option: %s\n", argv[i]);\r
+> - return 1;\r
+> - }\r
+> + opt_index = parse_arguments (argc, argv, options, 1);\r
+> + if (opt_index < 0) {\r
+> + /* diagnostics already printed */\r
+> + return 1;\r
+> }\r
+> +\r
+> config = notmuch_config_open (ctx, NULL, NULL);\r
+> if (config == NULL)\r
+> return 1;\r
+> @@ -884,7 +884,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+> add_files_state.synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);\r
+> db_path = notmuch_config_get_database_path (config);\r
+> \r
+> - if (run_hooks) {\r
+> + if (!no_hooks) {\r
+> ret = notmuch_run_hook (db_path, "pre-new");\r
+> if (ret)\r
+> return ret;\r
+> @@ -1045,7 +1045,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+> \r
+> notmuch_database_destroy (notmuch);\r
+> \r
+> - if (run_hooks && !ret && !interrupted)\r
+> + if (!no_hooks && !ret && !interrupted)\r
+> ret = notmuch_run_hook (db_path, "post-new");\r
+> \r
+> return ret || interrupted;\r
projects / notmuch-archives.git / commitdiff