--- /dev/null
+Return-Path: <bremner@tethera.net>\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 92481429E38\r
+ for <notmuch@notmuchmail.org>; Sun, 4 Dec 2011 07:48:21 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3] 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 UmPb0ipIF3pd for <notmuch@notmuchmail.org>;\r
+ Sun, 4 Dec 2011 07:48:18 -0800 (PST)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 5DEE4429E2F\r
+ for <notmuch@notmuchmail.org>; Sun, 4 Dec 2011 07:48:15 -0800 (PST)\r
+Received: from zancas.localnet\r
+ (fctnnbsc36w-156034079193.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+ [156.34.79.193]) (authenticated bits=0)\r
+ by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id pB4Fm8tA005365\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+ Sun, 4 Dec 2011 11:48:11 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1RXEIS-0001ou-F3; Sun, 04 Dec 2011 11:48:08 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/4] notmuch-search: convert to notmuch-opts argument parsing.\r
+Date: Sun, 4 Dec 2011 11:47:55 -0400\r
+Message-Id: <1323013675-6929-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1323013675-6929-1-git-send-email-david@tethera.net>\r
+References: <1323013675-6929-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.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: Sun, 04 Dec 2011 15:48:22 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+The switch on format_sel is slightly clunky, but it doesn't seem worth\r
+special casing argument processing for function pointers, when I think\r
+the function pointer approach will be modified/abandoned.\r
+---\r
+ notmuch-search.c | 110 ++++++++++++++++++++---------------------------------\r
+ 1 files changed, 42 insertions(+), 68 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 36686d1..a1cecb0 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -19,6 +19,7 @@\r
+ */\r
+ \r
+ #include "notmuch-client.h"\r
++#include "notmuch-opts.h"\r
+ \r
+ typedef enum {\r
+ OUTPUT_SUMMARY,\r
+@@ -415,81 +416,54 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ notmuch_database_t *notmuch;\r
+ notmuch_query_t *query;\r
+ char *query_str;\r
+- char *opt;\r
+ notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;\r
+ const search_format_t *format = &format_text;\r
+- int i, ret;\r
++ int opt_index, ret;\r
+ output_t output = OUTPUT_SUMMARY;\r
+ int offset = 0;\r
+ int limit = -1; /* unlimited */\r
+ \r
+- argc--; argv++; /* skip subcommand argument */\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], "--sort=") == 0) {\r
+- opt = argv[i] + sizeof ("--sort=") - 1;\r
+- if (strcmp (opt, "oldest-first") == 0) {\r
+- sort = NOTMUCH_SORT_OLDEST_FIRST;\r
+- } else if (strcmp (opt, "newest-first") == 0) {\r
+- sort = NOTMUCH_SORT_NEWEST_FIRST;\r
+- } else {\r
+- fprintf (stderr, "Invalid value for --sort: %s\n", opt);\r
+- return 1;\r
+- }\r
+- } else if (STRNCMP_LITERAL (argv[i], "--offset=") == 0) {\r
+- char *p;\r
+- opt = argv[i] + sizeof ("--offset=") - 1;\r
+- offset = strtol (opt, &p, 10);\r
+- if (*opt == '\0' || p == opt || *p != '\0') {\r
+- fprintf (stderr, "Invalid value for --offset: %s\n", opt);\r
+- return 1;\r
+- }\r
+- } else if (STRNCMP_LITERAL (argv[i], "--limit=") == 0) {\r
+- char *p;\r
+- opt = argv[i] + sizeof ("--limit=") - 1;\r
+- limit = strtoul (opt, &p, 10);\r
+- if (*opt == '\0' || p == opt || *p != '\0') {\r
+- fprintf (stderr, "Invalid value for --limit: %s\n", opt);\r
+- return 1;\r
+- }\r
+- } else if (STRNCMP_LITERAL (argv[i], "--format=") == 0) {\r
+- opt = argv[i] + sizeof ("--format=") - 1;\r
+- if (strcmp (opt, "text") == 0) {\r
+- format = &format_text;\r
+- } else if (strcmp (opt, "json") == 0) {\r
+- format = &format_json;\r
+- } else {\r
+- fprintf (stderr, "Invalid value for --format: %s\n", opt);\r
+- return 1;\r
+- }\r
+- } else if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {\r
+- opt = argv[i] + sizeof ("--output=") - 1;\r
+- if (strcmp (opt, "summary") == 0) {\r
+- output = OUTPUT_SUMMARY;\r
+- } else if (strcmp (opt, "threads") == 0) {\r
+- output = OUTPUT_THREADS;\r
+- } else if (strcmp (opt, "messages") == 0) {\r
+- output = OUTPUT_MESSAGES;\r
+- } else if (strcmp (opt, "files") == 0) {\r
+- output = OUTPUT_FILES;\r
+- } else if (strcmp (opt, "tags") == 0) {\r
+- output = OUTPUT_TAGS;\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
++ enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }\r
++ format_sel = NOTMUCH_FORMAT_TEXT;\r
++\r
++ notmuch_opt_desc_t options[] = {\r
++ { "sort", 's', NOTMUCH_OPT_KEYWORD,\r
++ (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },\r
++ { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },\r
++ {0, 0} },\r
++ &sort },\r
++ { "format", 'f', NOTMUCH_OPT_KEYWORD,\r
++ (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON },\r
++ { "text", NOTMUCH_FORMAT_TEXT },\r
++ {0, 0} },\r
++ &format_sel },\r
++ { "output", 'o', NOTMUCH_OPT_KEYWORD,\r
++ (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY },\r
++ { "threads", OUTPUT_THREADS },\r
++ { "messages", OUTPUT_MESSAGES },\r
++ { "files", OUTPUT_FILES },\r
++ { "tags", OUTPUT_TAGS },\r
++ {0, 0} },\r
++ &output },\r
++ { "offset", 'O', NOTMUCH_OPT_INT, 0, &offset },\r
++ { "limit", 'L', NOTMUCH_OPT_INT, 0, &limit },\r
++ { 0, 0, 0, 0, 0 }\r
++ };\r
++\r
++ opt_index = notmuch_parse_args (argc, argv, options, 1);\r
++\r
++ if (opt_index < 0) {\r
++ exit(1);\r
+ }\r
+ \r
+- argc -= i;\r
+- argv += i;\r
++ switch (format_sel) {\r
++ case NOTMUCH_FORMAT_TEXT:\r
++ format = &format_text;\r
++ break;\r
++ case NOTMUCH_FORMAT_JSON:\r
++ format = &format_json;\r
++ break;\r
++ }\r
+ \r
+ config = notmuch_config_open (ctx, NULL, NULL);\r
+ if (config == NULL)\r
+@@ -500,7 +474,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ if (notmuch == NULL)\r
+ return 1;\r
+ \r
+- query_str = query_string_from_args (notmuch, argc, argv);\r
++ query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index);\r
+ if (query_str == NULL) {\r
+ fprintf (stderr, "Out of memory.\n");\r
+ return 1;\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff