1 Return-Path: <amthrax@drake.mit.edu>
\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 AA597431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:27:55 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\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 4rpea6IbBmzj for <notmuch@notmuchmail.org>;
\r
16 Sat, 21 Apr 2012 21:27:55 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id E7A53431FAE
\r
20 for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:27:54 -0700 (PDT)
\r
21 X-AuditID: 1209190f-b7f8a6d000000914-50-4f9388ca71a8
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id D8.A8.02324.AC8839F4; Sun, 22 Apr 2012 00:27:54 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q3M4RsB7006283;
\r
27 Sun, 22 Apr 2012 00:27:54 -0400
\r
28 Received: from drake.mit.edu
\r
29 (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
30 [209.6.116.242]) (authenticated bits=0)
\r
31 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
32 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3M4Rr9T011058
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Sun, 22 Apr 2012 00:27:53 -0400 (EDT)
\r
35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)
\r
36 (envelope-from <amthrax@drake.mit.edu>)
\r
37 id 1SLoOu-0003I9-Sr; Sun, 22 Apr 2012 00:27:52 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH v2 2/4] new: Handle fatal errors in remove_filename and
\r
42 Date: Sun, 22 Apr 2012 00:27:46 -0400
\r
43 Message-Id: <1335068868-12593-3-git-send-email-amdragon@mit.edu>
\r
44 X-Mailer: git-send-email 1.7.9.1
\r
45 In-Reply-To: <1335068868-12593-1-git-send-email-amdragon@mit.edu>
\r
46 References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>
\r
47 <1335068868-12593-1-git-send-email-amdragon@mit.edu>
\r
48 X-Brightmail-Tracker:
\r
49 H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqrHuqY7K/wZkbYhbXb85kdmD0eLbq
\r
50 FnMAYxSXTUpqTmZZapG+XQJXxvsJ29kKuiUrfhxrZW9gbBXpYuTgkBAwkTj606aLkRPIFJO4
\r
51 cG89WxcjF4eQwD5GibUXFrBAOBsYJX4vWMwM4dxnkvj1bwkjSIuQwHxGiTNvBEBsNgENiW37
\r
52 l4PFRQSkJXbenc0KsoFZQE3iT5cKSFhYIFJiwoltYGEWAVWJ4ytZQcK8Ag4Sa04eZII4QkHi
\r
53 2brjYDangKPE4pfHoTaVSTS9XMY4gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0TvdzM
\r
54 Er3UlNJNjOCAkeTfwfjtoNIhRgEORiUe3lcmk/2FWBPLiitzDzFKcjApifLqVwKF+JLyUyoz
\r
55 Eosz4otKc1KLDzFKcDArifB+FgHK8aYkVlalFuXDpKQ5WJTEedW03vkJCaQnlqRmp6YWpBbB
\r
56 ZGU4OJQkeBPagBoFi1LTUyvSMnNKENJMHJwgw3mAhj9vBxleXJCYW5yZDpE/xagoJc6bD9Is
\r
57 AJLIKM2D64VF9CtGcaBXhHkFQKp4gMkArvsV0GAmoMEJMZNABpckIqSkGhiDTuQYO08wWS2S
\r
58 9k4z7EjlxO3LmhfwfBRTM7KxOVweGPE/pWxOvY5P9kWbG8yxpicrg6XL35m9MS9feO6793Mj
\r
59 nvTw/VYzWd2ustTuOfeoOer/7J06q3Kiwh223do2Oev3JKZfTR4c22P3qoqdbU5WnDjhzYlH
\r
60 i1uUvq7PjprDcvXe9sPn195TYinOSDTUYi4qTgQAMpDAmMMCAAA=
\r
61 X-BeenThere: notmuch@notmuchmail.org
\r
62 X-Mailman-Version: 2.1.13
\r
64 List-Id: "Use and development of the notmuch mail system."
\r
65 <notmuch.notmuchmail.org>
\r
66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
69 List-Post: <mailto:notmuch@notmuchmail.org>
\r
70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
73 X-List-Received-Date: Sun, 22 Apr 2012 04:27:55 -0000
\r
75 Previously such errors were simply ignored. Now they cause an
\r
76 immediate cleanup and abort.
\r
78 notmuch-new.c | 25 +++++++++++++++++++------
\r
79 1 files changed, 19 insertions(+), 6 deletions(-)
\r
81 diff --git a/notmuch-new.c b/notmuch-new.c
\r
82 index 15c0b36..92e0489 100644
\r
85 @@ -785,8 +785,10 @@ remove_filename (notmuch_database_t *notmuch,
\r
86 add_files_state->renamed_messages++;
\r
87 if (add_files_state->synchronize_flags == TRUE)
\r
88 notmuch_message_maildir_flags_to_tags (message);
\r
90 + status = NOTMUCH_STATUS_SUCCESS;
\r
91 + } else if (status == NOTMUCH_STATUS_SUCCESS) {
\r
92 add_files_state->removed_messages++;
\r
94 notmuch_message_destroy (message);
\r
95 notmuch_database_end_atomic (notmuch);
\r
97 @@ -794,12 +796,13 @@ remove_filename (notmuch_database_t *notmuch,
\r
99 /* Recursively remove all filenames from the database referring to
\r
100 * 'path' (or to any of its children). */
\r
102 +static notmuch_status_t
\r
103 _remove_directory (void *ctx,
\r
104 notmuch_database_t *notmuch,
\r
106 add_files_state_t *add_files_state)
\r
108 + notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
\r
109 notmuch_directory_t *directory;
\r
110 notmuch_filenames_t *files, *subdirs;
\r
112 @@ -812,8 +815,10 @@ _remove_directory (void *ctx,
\r
114 absolute = talloc_asprintf (ctx, "%s/%s", path,
\r
115 notmuch_filenames_get (files));
\r
116 - remove_filename (notmuch, absolute, add_files_state);
\r
117 + status = remove_filename (notmuch, absolute, add_files_state);
\r
118 talloc_free (absolute);
\r
123 for (subdirs = notmuch_directory_get_child_directories (directory);
\r
124 @@ -822,11 +827,15 @@ _remove_directory (void *ctx,
\r
126 absolute = talloc_asprintf (ctx, "%s/%s", path,
\r
127 notmuch_filenames_get (subdirs));
\r
128 - _remove_directory (ctx, notmuch, absolute, add_files_state);
\r
129 + status = _remove_directory (ctx, notmuch, absolute, add_files_state);
\r
130 talloc_free (absolute);
\r
136 notmuch_directory_destroy (directory);
\r
137 + return NOTMUCH_STATUS_SUCCESS;
\r
141 @@ -944,7 +953,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
\r
143 gettimeofday (&tv_start, NULL);
\r
144 for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {
\r
145 - remove_filename (notmuch, f->filename, &add_files_state);
\r
146 + ret = remove_filename (notmuch, f->filename, &add_files_state);
\r
149 if (do_print_progress) {
\r
150 do_print_progress = 0;
\r
151 generic_print_progress ("Cleaned up", "messages",
\r
152 @@ -955,7 +966,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
\r
154 gettimeofday (&tv_start, NULL);
\r
155 for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {
\r
156 - _remove_directory (ctx, notmuch, f->filename, &add_files_state);
\r
157 + ret = _remove_directory (ctx, notmuch, f->filename, &add_files_state);
\r
160 if (do_print_progress) {
\r
161 do_print_progress = 0;
\r
162 generic_print_progress ("Cleaned up", "directories",
\r