1 Return-Path: <bremner@unb.ca>
\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 olra.theworths.org (Postfix) with ESMTP id 567CC431FAF
\r
6 for <notmuch@notmuchmail.org>; Sun, 9 Dec 2012 04:55:47 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id at5CM-zh3+C3 for <notmuch@notmuchmail.org>;
\r
16 Sun, 9 Dec 2012 04:55:46 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 0403A431FAE
\r
21 for <notmuch@notmuchmail.org>; Sun, 9 Dec 2012 04:55:45 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@unb.ca>)
\r
27 id 1ThgQ4-0006or-QK; Sun, 09 Dec 2012 08:55:45 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@unb.ca>)
\r
30 id 1ThgPd-0006nm-RI; Sun, 09 Dec 2012 08:55:17 -0400
\r
31 From: David Bremner <david@tethera.net>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: Re: v5 of Batch-tag dump/restore patches
\r
34 In-Reply-To: <1355007421-3069-1-git-send-email-david@tethera.net>
\r
35 References: <1355007421-3069-1-git-send-email-david@tethera.net>
\r
36 User-Agent: Notmuch/0.14+151~g9a98977 (http://notmuchmail.org) Emacs/24.1.1
\r
37 (x86_64-pc-linux-gnu)
\r
38 Date: Sun, 09 Dec 2012 08:55:17 -0400
\r
39 Message-ID: <877gorqtai.fsf@zancas.localnet>
\r
41 Content-Type: text/plain
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Sun, 09 Dec 2012 12:55:47 -0000
\r
57 david@tethera.net writes:
\r
59 > Yet another version. Luckily we all use threaded mailreaders, right?
\r
62 A few fixups Jani mentioned in IRC:
\r
64 commit 4cbd366d3cd29b5d26b36f3744c26b0853b23437
\r
65 Author: David Bremner <bremner@debian.org>
\r
66 Date: Sun Dec 9 08:49:29 2012 -0400
\r
68 remove unused sigatomic_t from notmuch-restore
\r
70 I guess this must be cut and paste error from Jani's notmuch-tag code
\r
72 diff --git a/notmuch-restore.c b/notmuch-restore.c
\r
73 index dba882b..40596a8 100644
\r
74 --- a/notmuch-restore.c
\r
75 +++ b/notmuch-restore.c
\r
77 #include "tag-util.h"
\r
78 #include "string-util.h"
\r
80 -static volatile sig_atomic_t interrupted;
\r
81 static regex_t regex;
\r
85 commit 75b2fab1874fc9f0bab514fe832cfd85d1319877
\r
86 Author: David Bremner <bremner@debian.org>
\r
87 Date: Sun Dec 9 08:47:12 2012 -0400
\r
89 enum fixup for tag-utils
\r
91 diff --git a/tag-util.c b/tag-util.c
\r
92 index e7233ab..eab482f 100644
\r
95 @@ -16,7 +16,7 @@ struct _tag_op_list_t {
\r
100 +static tag_parse_status_t
\r
101 line_error (tag_parse_status_t status,
\r
103 const char *format, ...)
\r
104 @@ -31,7 +31,7 @@ line_error (tag_parse_status_t status,
\r
109 +tag_parse_status_t
\r
110 parse_tag_line (void *ctx, char *line,
\r
111 tag_op_flag_t flags,
\r
112 char **query_string,
\r
113 @@ -56,7 +56,7 @@ parse_tag_line (void *ctx, char *line,
\r
115 /* Skip empty and comment lines. */
\r
116 if (*tok == '\0' || *tok == '#') {
\r
118 + ret = TAG_PARSE_SKIPPED;
\r