version 5 of libconfig / single argument date / named query patches

diff --git a/8e/1c1c51d65b02270254e61767f5691213c8cdfd b/8e/1c1c51d65b02270254e61767f5691213c8cdfd
new file mode 100644 (file)
index 0000000..053f7f9
--- /dev/null
+++ b/8e/1c1c51d65b02270254e61767f5691213c8cdfd
@@ -0,0 +1,174 @@
+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 arlo.cworth.org (Postfix) with ESMTP id D7A146DE0926\r
+ for <notmuch@notmuchmail.org>; Fri, 13 May 2016 03:38:38 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.013\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.013 tagged_above=-999 required=5\r
+ tests=[AWL=-0.002, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ 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 82ZdgzbiXbOh for <notmuch@notmuchmail.org>;\r
+ Fri, 13 May 2016 03:38:30 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 2C5786DE0188\r
+ for <notmuch@notmuchmail.org>; Fri, 13 May 2016 03:38:22 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>) id 1b1AU0-0003Nx-VT\r
+ for notmuch@notmuchmail.org; Fri, 13 May 2016 06:38:12 -0400\r
+Received: (nullmailer pid 7541 invoked by uid 1000);\r
+ Fri, 13 May 2016 10:38:16 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: version 5 of libconfig / single argument date / named query patches\r
+Date: Fri, 13 May 2016 07:38:02 -0300\r
+Message-Id: <1463135893-7471-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 13 May 2016 10:38:39 -0000\r
+\r
+This obsoletes\r
+\r
+     id:1462665889-17121-1-git-send-email-david@tethera.net\r
+\r
+Diff since that version at the end, essentially just responding to\r
+\r
+     id:m2oa8h2byk.fsf@guru.guru-group.fi\r
+\r
+\r
+I'm going to mark the first four as ready to go.\r
+\r
+[Patch v5 01/11] configure: detect Xapian:FieldProcessor\r
+[Patch v5 02/11] lib: optionally support single argument date:\r
+[Patch v5 03/11] lib/cli: add library API / CLI for compile time\r
+[Patch v5 04/11] configure: check directly for xapian compaction API\r
+\r
+I don't know of any blockers with the remaining patches, but I want to\r
+give a little more time, and one more reminder, for discussion on the\r
+dump/restore changes.\r
+\r
+diff --git a/configure b/configure\r
+index f94f7c7..eb143b2 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -1094,7 +1094,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\\r
+                  -DSTD_GETPWUID=\$(STD_GETPWUID)                       \\\r
+                  -DSTD_ASCTIME=\$(STD_ASCTIME)                         \\\r
+                  -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)         \\\r
+-                 -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_PROCESSOR) \\\r
++                 -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\\r
+                  -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)\r
+ \r
+ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\\r
+diff --git a/lib/built-with.c b/lib/built-with.c\r
+index b619bed..7ea1d7f 100644\r
+--- a/lib/built-with.c\r
++++ b/lib/built-with.c\r
+@@ -22,7 +22,8 @@\r
+ #include "notmuch-private.h"\r
+ \r
+ notmuch_bool_t\r
+-notmuch_built_with (const char *name) {\r
++notmuch_built_with (const char *name)\r
++{\r
+     if (STRNCMP_LITERAL (name, "compact") == 0) {\r
+       return HAVE_XAPIAN_COMPACT;\r
+     } else if (STRNCMP_LITERAL (name, "field_processor") == 0) {\r
+diff --git a/lib/query-fp.cc b/lib/query-fp.cc\r
+index dab78d2..73790cd 100644\r
+--- a/lib/query-fp.cc\r
++++ b/lib/query-fp.cc\r
+@@ -1,4 +1,4 @@\r
+-/* query-fp.cc -  "query:" field processor glue glue\r
++/* query-fp.cc - "query:" field processor glue\r
+  *\r
+  * This file is part of notmuch.\r
+  *\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index ae6f124..c130b93 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -447,8 +447,8 @@ typedef enum dump_formats {\r
+ } dump_format_t;\r
+ \r
+ typedef enum dump_includes {\r
+-    DUMP_INCLUDE_TAGS=1,\r
+-    DUMP_INCLUDE_CONFIG=2,\r
++    DUMP_INCLUDE_TAGS = 1,\r
++    DUMP_INCLUDE_CONFIG = 2,\r
+ } dump_include_t;\r
+ \r
+ #define NOTMUCH_DUMP_VERSION 2\r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index f8636d5..c618f2c 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -903,7 +903,8 @@ notmuch_config_command_set (notmuch_config_t *config, char *item, int argc, char\r
+ \r
+ static\r
+ void\r
+-_notmuch_config_list_built_with () {\r
++_notmuch_config_list_built_with ()\r
++{\r
+     printf("%scompact=%s\n",\r
+          BUILT_WITH_PREFIX,\r
+          notmuch_built_with ("compact") ? "true" : "false");\r
+diff --git a/notmuch-dump.c b/notmuch-dump.c\r
+index a6cf810..8e79511 100644\r
+--- a/notmuch-dump.c\r
++++ b/notmuch-dump.c\r
+@@ -75,8 +75,6 @@ print_dump_header (gzFile output, int output_format, int include)\r
+             (include & DUMP_INCLUDE_CONFIG) ? "config" : "",\r
+             (include & DUMP_INCLUDE_TAGS) && (include & DUMP_INCLUDE_CONFIG) ? "," : "",\r
+             (include & DUMP_INCLUDE_TAGS) ? "tags" : "");\r
+-\r
+-\r
+ }\r
+ \r
+ static int\r
+diff --git a/notmuch-restore.c b/notmuch-restore.c\r
+index e06fbde..1f37f5c 100644\r
+--- a/notmuch-restore.c\r
++++ b/notmuch-restore.c\r
+@@ -25,7 +25,8 @@\r
+ #include "zlib-extra.h"\r
+ \r
+ static int\r
+-process_config_line(notmuch_database_t *notmuch, const char* line){\r
++process_config_line(notmuch_database_t *notmuch, const char* line)\r
++{\r
+     const char *key_p, *val_p;\r
+     char *key, *val;\r
+     size_t key_len,val_len;\r
+@@ -34,11 +35,11 @@ process_config_line(notmuch_database_t *notmuch, const char* line){\r
+ \r
+     void *local = talloc_new(NULL);\r
+ \r
+-    key_p = strtok_len_c(line, delim, &key_len);\r
+-    val_p = strtok_len_c(key_p+key_len, delim, &val_len);\r
++    key_p = strtok_len_c (line, delim, &key_len);\r
++    val_p = strtok_len_c (key_p + key_len, delim, &val_len);\r
+ \r
+-    key = talloc_strndup(local, key_p, key_len);\r
+-    val = talloc_strndup(local, val_p, val_len);\r
++    key = talloc_strndup (local, key_p, key_len);\r
++    val = talloc_strndup (local, val_p, val_len);\r
+     if (hex_decode_inplace (key) != HEX_SUCCESS ||\r
+       hex_decode_inplace (val) != HEX_SUCCESS ) {\r
+       fprintf (stderr, "hex decoding failure on line %s\n", line);\r