1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id D7A146DE0926
\r
6 for <notmuch@notmuchmail.org>; Fri, 13 May 2016 03:38:38 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.013 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.002, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]
\r
14 Received: from arlo.cworth.org ([127.0.0.1])
\r
15 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 82ZdgzbiXbOh for <notmuch@notmuchmail.org>;
\r
17 Fri, 13 May 2016 03:38:30 -0700 (PDT)
\r
18 Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
\r
19 by arlo.cworth.org (Postfix) with ESMTPS id 2C5786DE0188
\r
20 for <notmuch@notmuchmail.org>; Fri, 13 May 2016 03:38:22 -0700 (PDT)
\r
21 Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
\r
22 (envelope-from <bremner@tethera.net>) id 1b1AU0-0003Nx-VT
\r
23 for notmuch@notmuchmail.org; Fri, 13 May 2016 06:38:12 -0400
\r
24 Received: (nullmailer pid 7541 invoked by uid 1000);
\r
25 Fri, 13 May 2016 10:38:16 -0000
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Subject: version 5 of libconfig / single argument date / named query patches
\r
29 Date: Fri, 13 May 2016 07:38:02 -0300
\r
30 Message-Id: <1463135893-7471-1-git-send-email-david@tethera.net>
\r
31 X-Mailer: git-send-email 2.8.1
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.20
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Fri, 13 May 2016 10:38:39 -0000
\r
48 id:1462665889-17121-1-git-send-email-david@tethera.net
\r
50 Diff since that version at the end, essentially just responding to
\r
52 id:m2oa8h2byk.fsf@guru.guru-group.fi
\r
55 I'm going to mark the first four as ready to go.
\r
57 [Patch v5 01/11] configure: detect Xapian:FieldProcessor
\r
58 [Patch v5 02/11] lib: optionally support single argument date:
\r
59 [Patch v5 03/11] lib/cli: add library API / CLI for compile time
\r
60 [Patch v5 04/11] configure: check directly for xapian compaction API
\r
62 I don't know of any blockers with the remaining patches, but I want to
\r
63 give a little more time, and one more reminder, for discussion on the
\r
64 dump/restore changes.
\r
66 diff --git a/configure b/configure
\r
67 index f94f7c7..eb143b2 100755
\r
70 @@ -1094,7 +1094,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\r
71 -DSTD_GETPWUID=\$(STD_GETPWUID) \\
\r
72 -DSTD_ASCTIME=\$(STD_ASCTIME) \\
\r
73 -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT) \\
\r
74 - -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_PROCESSOR) \\
\r
75 + -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
\r
76 -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)
\r
78 CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\r
79 diff --git a/lib/built-with.c b/lib/built-with.c
\r
80 index b619bed..7ea1d7f 100644
\r
81 --- a/lib/built-with.c
\r
82 +++ b/lib/built-with.c
\r
84 #include "notmuch-private.h"
\r
87 -notmuch_built_with (const char *name) {
\r
88 +notmuch_built_with (const char *name)
\r
90 if (STRNCMP_LITERAL (name, "compact") == 0) {
\r
91 return HAVE_XAPIAN_COMPACT;
\r
92 } else if (STRNCMP_LITERAL (name, "field_processor") == 0) {
\r
93 diff --git a/lib/query-fp.cc b/lib/query-fp.cc
\r
94 index dab78d2..73790cd 100644
\r
95 --- a/lib/query-fp.cc
\r
96 +++ b/lib/query-fp.cc
\r
98 -/* query-fp.cc - "query:" field processor glue glue
\r
99 +/* query-fp.cc - "query:" field processor glue
\r
101 * This file is part of notmuch.
\r
103 diff --git a/notmuch-client.h b/notmuch-client.h
\r
104 index ae6f124..c130b93 100644
\r
105 --- a/notmuch-client.h
\r
106 +++ b/notmuch-client.h
\r
107 @@ -447,8 +447,8 @@ typedef enum dump_formats {
\r
110 typedef enum dump_includes {
\r
111 - DUMP_INCLUDE_TAGS=1,
\r
112 - DUMP_INCLUDE_CONFIG=2,
\r
113 + DUMP_INCLUDE_TAGS = 1,
\r
114 + DUMP_INCLUDE_CONFIG = 2,
\r
117 #define NOTMUCH_DUMP_VERSION 2
\r
118 diff --git a/notmuch-config.c b/notmuch-config.c
\r
119 index f8636d5..c618f2c 100644
\r
120 --- a/notmuch-config.c
\r
121 +++ b/notmuch-config.c
\r
122 @@ -903,7 +903,8 @@ notmuch_config_command_set (notmuch_config_t *config, char *item, int argc, char
\r
126 -_notmuch_config_list_built_with () {
\r
127 +_notmuch_config_list_built_with ()
\r
129 printf("%scompact=%s\n",
\r
131 notmuch_built_with ("compact") ? "true" : "false");
\r
132 diff --git a/notmuch-dump.c b/notmuch-dump.c
\r
133 index a6cf810..8e79511 100644
\r
134 --- a/notmuch-dump.c
\r
135 +++ b/notmuch-dump.c
\r
136 @@ -75,8 +75,6 @@ print_dump_header (gzFile output, int output_format, int include)
\r
137 (include & DUMP_INCLUDE_CONFIG) ? "config" : "",
\r
138 (include & DUMP_INCLUDE_TAGS) && (include & DUMP_INCLUDE_CONFIG) ? "," : "",
\r
139 (include & DUMP_INCLUDE_TAGS) ? "tags" : "");
\r
145 diff --git a/notmuch-restore.c b/notmuch-restore.c
\r
146 index e06fbde..1f37f5c 100644
\r
147 --- a/notmuch-restore.c
\r
148 +++ b/notmuch-restore.c
\r
150 #include "zlib-extra.h"
\r
153 -process_config_line(notmuch_database_t *notmuch, const char* line){
\r
154 +process_config_line(notmuch_database_t *notmuch, const char* line)
\r
156 const char *key_p, *val_p;
\r
158 size_t key_len,val_len;
\r
159 @@ -34,11 +35,11 @@ process_config_line(notmuch_database_t *notmuch, const char* line){
\r
161 void *local = talloc_new(NULL);
\r
163 - key_p = strtok_len_c(line, delim, &key_len);
\r
164 - val_p = strtok_len_c(key_p+key_len, delim, &val_len);
\r
165 + key_p = strtok_len_c (line, delim, &key_len);
\r
166 + val_p = strtok_len_c (key_p + key_len, delim, &val_len);
\r
168 - key = talloc_strndup(local, key_p, key_len);
\r
169 - val = talloc_strndup(local, val_p, val_len);
\r
170 + key = talloc_strndup (local, key_p, key_len);
\r
171 + val = talloc_strndup (local, val_p, val_len);
\r
172 if (hex_decode_inplace (key) != HEX_SUCCESS ||
\r
173 hex_decode_inplace (val) != HEX_SUCCESS ) {
\r
174 fprintf (stderr, "hex decoding failure on line %s\n", line);
\r