--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 41000431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 16 Apr 2012 09:02:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, 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 mXFOOorU5EBg for <notmuch@notmuchmail.org>;\r
+ Mon, 16 Apr 2012 09:02:23 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\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 19E05431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 16 Apr 2012 09:02:23 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SJoNe-0003iz-0Y; Mon, 16 Apr 2012 17:02:20 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SJoNd-0005ct-IM; Mon, 16 Apr 2012 17:02:17 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/3] new: Handle fatal errors in remove_filename and\r
+ _remove_directory\r
+In-Reply-To: <1330357759-1337-3-git-send-email-amdragon@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+ <1330357759-1337-3-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.12+110~gbc97b4a (http://notmuchmail.org) Emacs/23.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 16 Apr 2012 17:02:37 +0100\r
+Message-ID: <87wr5f4qci.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 5eaeadecc221fe0613c546ee760dc5a3 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Mon, 16 Apr 2012 16:02:25 -0000\r
+\r
+On Mon, 27 Feb 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Previously such errors were simply ignored. Now they cause an\r
+> immediate cleanup and abort.\r
+\r
+This one looks fine except for a minor query.\r
+\r
+> ---\r
+> notmuch-new.c | 24 ++++++++++++++++++------\r
+> 1 files changed, 18 insertions(+), 6 deletions(-)\r
+>\r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index bd9786a..0cbd479 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -780,8 +780,10 @@ remove_filename (notmuch_database_t *notmuch,\r
+> add_files_state->renamed_messages++;\r
+> if (add_files_state->synchronize_flags == TRUE)\r
+> notmuch_message_maildir_flags_to_tags (message);\r
+> - } else\r
+> + status = NOTMUCH_STATUS_SUCCESS;\r
+> + } else if (status == NOTMUCH_STATUS_SUCCESS) {\r
+> add_files_state->removed_messages++;\r
+> + }\r
+> notmuch_message_destroy (message);\r
+> notmuch_database_end_atomic (notmuch);\r
+> return status;\r
+> @@ -789,12 +791,13 @@ remove_filename (notmuch_database_t *notmuch,\r
+> \r
+> /* Recursively remove all filenames from the database referring to\r
+> * 'path' (or to any of its children). */\r
+> -static void\r
+> +static notmuch_status_t\r
+> _remove_directory (void *ctx,\r
+> notmuch_database_t *notmuch,\r
+> const char *path,\r
+> add_files_state_t *add_files_state)\r
+> {\r
+> + notmuch_status_t status;\r
+> notmuch_directory_t *directory;\r
+> notmuch_filenames_t *files, *subdirs;\r
+> char *absolute;\r
+> @@ -807,8 +810,10 @@ _remove_directory (void *ctx,\r
+> {\r
+> absolute = talloc_asprintf (ctx, "%s/%s", path,\r
+> notmuch_filenames_get (files));\r
+> - remove_filename (notmuch, absolute, add_files_state);\r
+> + status = remove_filename (notmuch, absolute, add_files_state);\r
+> talloc_free (absolute);\r
+> + if (status)\r
+> + return status;\r
+> }\r
+> \r
+> for (subdirs = notmuch_directory_get_child_directories (directory);\r
+> @@ -817,11 +822,14 @@ _remove_directory (void *ctx,\r
+> {\r
+> absolute = talloc_asprintf (ctx, "%s/%s", path,\r
+> notmuch_filenames_get (subdirs));\r
+> - _remove_directory (ctx, notmuch, absolute, add_files_state);\r
+> + status = _remove_directory (ctx, notmuch, absolute, add_files_state);\r
+> talloc_free (absolute);\r
+> + if (status)\r
+> + return status;\r
+> }\r
+> \r
+> notmuch_directory_destroy (directory);\r
+> + return NOTMUCH_STATUS_SUCCESS;\r
+> }\r
+\r
+In the two "return status" lines above seem to mean we don't call\r
+notmuch_directory_destroy. Does that matter?\r
+\r
+The other query is not actually about this patch: just something that\r
+came up when reading it. Should notmuch_database_begin_atomic and\r
+notmuch_database_end_atomic always be paired? One of the (existing)\r
+error cases in remove_filename seems to return without calling end.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+> int\r
+> @@ -939,7 +947,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+> \r
+> gettimeofday (&tv_start, NULL);\r
+> for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {\r
+> - remove_filename (notmuch, f->filename, &add_files_state);\r
+> + ret = remove_filename (notmuch, f->filename, &add_files_state);\r
+> + if (ret)\r
+> + goto DONE;\r
+> if (do_print_progress) {\r
+> do_print_progress = 0;\r
+> generic_print_progress ("Cleaned up", "messages",\r
+> @@ -950,7 +960,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+> \r
+> gettimeofday (&tv_start, NULL);\r
+> for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {\r
+> - _remove_directory (ctx, notmuch, f->filename, &add_files_state);\r
+> + ret = _remove_directory (ctx, notmuch, f->filename, &add_files_state);\r
+> + if (ret)\r
+> + goto DONE;\r
+> if (do_print_progress) {\r
+> do_print_progress = 0;\r
+> generic_print_progress ("Cleaned up", "directories",\r
+> -- \r
+> 1.7.7.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff