--- /dev/null
+Return-Path: <amthrax@drake.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 AA47E429E48\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 15:07:12 -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 wZBEyzfzjRMx for <notmuch@notmuchmail.org>;\r
+ Fri, 13 Jan 2012 15:07:12 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+ [18.7.68.35])\r
+ by olra.theworths.org (Postfix) with ESMTP id CE0D4429E25\r
+ for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 15:07:11 -0800 (PST)\r
+X-AuditID: 12074423-b7f9c6d0000008c3-4f-4f10b91fa8a8\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 87.0A.02243.F19B01F4; Fri, 13 Jan 2012 18:07:11 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q0DN7ADO030620; \r
+ Fri, 13 Jan 2012 18:07:10 -0500\r
+Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166])\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 q0DN79cl028769\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Fri, 13 Jan 2012 18:07:09 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1RlqDF-0003lq-0g; Fri, 13 Jan 2012 18:07:09 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/3] count: Convert to new-style argument parsing\r
+Date: Fri, 13 Jan 2012 18:07:02 -0500\r
+Message-Id: <1326496024-14403-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1326496024-14403-1-git-send-email-amdragon@mit.edu>\r
+References: <1326258173-21163-1-git-send-email-amdragon@mit.edu>\r
+ <1326496024-14403-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsUixG6nriu/U8Df4NcPAYum6c4We/Z5WVy/\r
+ OZPZgdnj7mkuj1v3X7N7PFt1izmAOYrLJiU1J7MstUjfLoErY/d9wYKPIhWPjv9ha2A8zd/F\r
+ yMkhIWAisfrHRnYIW0ziwr31bF2MXBxCAvsYJS4fPwzlbGCUeLb/ByOEc5xJYtm6aVDOfEaJ\r
+ 5ys+soH0swloSGzbv5wRxBYRkJbYeXc2K4jNLOAo8fPeQyCbg0NYwEXi2v4CEJNFQFXi2dpo\r
+ kApeAQeJrs/n2SCuUJA4t/oc2EWcQJ1/X3WCTRQSKJdYfGQN4wRG/gWMDKsYZVNyq3RzEzNz\r
+ ilOTdYuTE/PyUot0zfRyM0v0UlNKNzGCg8pFeQfjn4NKhxgFOBiVeHglswT8hVgTy4orcw8x\r
+ SnIwKYnyPtgGFOJLyk+pzEgszogvKs1JLT7EKMHBrCTCK2UKlONNSaysSi3Kh0lJc7AoifNq\r
+ aL3zExJITyxJzU5NLUgtgsnKcHAoSfDy7wBqFCxKTU+tSMvMKUFIM3FwggznARrOBVLDW1yQ\r
+ mFucmQ6RP8WoKCXOqwiSEABJZJTmwfXCov4VozjQK8K8vCBVPMCEAdf9CmgwE9DgshQ+kMEl\r
+ iQgpqQZGtfp4jpnvC3hslPf9b4nosgw35M/yOe7C+z93p0XP3oanN/gCltt27GaM7p+1Iu8h\r
+ 34JDAsnrDartjO+Hxv4IlSgP119bGHPt/8y1l8PtK8/2RZyees5nvl6TgfQSr4Vm6UdKTZU/\r
+ X5D5GPeu/Vf1R3+t4KMb45jCT+tFNK229F5607mi2V6JpTgj0VCLuag4EQD0ftmp1QIAAA==\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: Fri, 13 Jan 2012 23:07:12 -0000\r
+\r
+---\r
+ notmuch-count.c | 53 +++++++++++++++++++++++++----------------------------\r
+ 1 files changed, 25 insertions(+), 28 deletions(-)\r
+\r
+diff --git a/notmuch-count.c b/notmuch-count.c\r
+index 20ce334..0982f99 100644\r
+--- a/notmuch-count.c\r
++++ b/notmuch-count.c\r
+@@ -21,6 +21,11 @@\r
+ \r
+ #include "notmuch-client.h"\r
+ \r
++enum {\r
++ OUTPUT_THREADS,\r
++ OUTPUT_MESSAGES,\r
++};\r
++\r
+ int\r
+ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+ {\r
+@@ -28,35 +33,23 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+ notmuch_database_t *notmuch;\r
+ notmuch_query_t *query;\r
+ char *query_str;\r
+- int i;\r
+- notmuch_bool_t output_messages = TRUE;\r
++ int opt_index;\r
++ int output = OUTPUT_MESSAGES;\r
+ \r
+- argc--; argv++; /* skip subcommand argument */\r
++ notmuch_opt_desc_t options[] = {\r
++ { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',\r
++ (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },\r
++ { "messages", OUTPUT_MESSAGES },\r
++ { 0, 0 } } },\r
++ { 0, 0, 0, 0, 0 }\r
++ };\r
+ \r
+- for (i = 0; i < argc && argv[i][0] == '-'; i++) {\r
+- if (strcmp (argv[i], "--") == 0) {\r
+- i++;\r
+- break;\r
+- }\r
+- if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {\r
+- const char *opt = argv[i] + sizeof ("--output=") - 1;\r
+- if (strcmp (opt, "threads") == 0) {\r
+- output_messages = FALSE;\r
+- } else if (strcmp (opt, "messages") == 0) {\r
+- output_messages = TRUE;\r
+- } else {\r
+- fprintf (stderr, "Invalid value for --output: %s\n", opt);\r
+- return 1;\r
+- }\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
++\r
++ if (opt_index < 0) {\r
++ return 1;\r
+ }\r
+ \r
+- argc -= i;\r
+- argv += i;\r
+-\r
+ config = notmuch_config_open (ctx, NULL, NULL);\r
+ if (config == NULL)\r
+ return 1;\r
+@@ -66,7 +59,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+ if (notmuch == NULL)\r
+ return 1;\r
+ \r
+- query_str = query_string_from_args (ctx, argc, argv);\r
++ query_str = query_string_from_args (ctx, argc-opt_index, argv+opt_index);\r
+ if (query_str == NULL) {\r
+ fprintf (stderr, "Out of memory.\n");\r
+ return 1;\r
+@@ -82,10 +75,14 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+ return 1;\r
+ }\r
+ \r
+- if (output_messages)\r
++ switch (output) {\r
++ case OUTPUT_MESSAGES:\r
+ printf ("%u\n", notmuch_query_count_messages (query));\r
+- else\r
++ break;\r
++ case OUTPUT_THREADS:\r
+ printf ("%u\n", notmuch_query_count_threads (query));\r
++ break;\r
++ }\r
+ \r
+ notmuch_query_destroy (query);\r
+ notmuch_database_close (notmuch);\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / blobdiff