--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\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 ADC8A431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:50:59 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 Gdl5Y9FMsNdb for <notmuch@notmuchmail.org>;\r
+ Sun, 22 Apr 2012 08:50:58 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 81EF8431FBD\r
+ for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:50:58 -0700 (PDT)\r
+X-AuditID: 12074424-b7fae6d000000906-f4-4f9428e29453\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 9D.8B.02310.2E8249F4; Sun, 22 Apr 2012 11:50:58 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q3MFovDI018620; \r
+ Sun, 22 Apr 2012 11:50:57 -0400\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3MFou1h003693\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 22 Apr 2012 11:50:57 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1SLz3w-0002fD-F0; Sun, 22 Apr 2012 11:50:56 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 2/4] new: Handle fatal errors in remove_filename and\r
+ _remove_directory\r
+Date: Sun, 22 Apr 2012 11:50:50 -0400\r
+Message-Id: <1335109852-10150-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+ <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrftIY4q/wck9bBbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxrl1T5kKfktULDw+hbWB8atwFyMnh4SAicTv1m4WCFtM4sK9\r
+ 9WxdjFwcQgL7GCU2Pr7HDuFsYJQ48PY3K4Rzn0li7bMJUGXzGSXWvXsO1s8moCGxbf9yRhBb\r
+ REBaYufd2UAdHBzMAmoSf7pUQMLCApESFz7+ZQIJswioSrQ8CwcJ8wo4SNx50cEEcYWCxLN1\r
+ x8FsTgFHiY/vVoLZQgJlEt/mvWWfwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5qka65Xm5m\r
+ iV5qSukmRlDQsLuo7GBsPqR0iFGAg1GJh/eVyWR/IdbEsuLK3EOMkhxMSqK8bmpT/IX4kvJT\r
+ KjMSizPii0pzUosPMUpwMCuJ8H4WASrnTUmsrEotyodJSXOwKInzami98xMSSE8sSc1OTS1I\r
+ LYLJynBwKEnwmgOjQ0iwKDU9tSItM6cEIc3EwQkynAdouDVIDW9xQWJucWY6RP4Uo6KUOK8y\r
+ SEIAJJFRmgfXC4vqV4ziQK8I84aAVPEAEwJc9yugwUxAgxNiJoEMLklESEk1MKZX2ZyedSIq\r
+ pGWVlesC1SsB87d0ZJst6dibI6Bry/fv9M7Z7bOP7b8gub1K+fHF4IeMdT+lV0jP7/oxK/Bh\r
+ WPNW0ydaBcdWBZyQurc3nt2sx5H1WvGVzNCG7JAvd5iWSYafZNx3vV3jkmbofEFesbUrBCyN\r
+ esztRP8fu+zxSPUw07eKZXfik5RYijMSDbWYi4oTAWJL7HzFAgAA\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: Sun, 22 Apr 2012 15:51:00 -0000\r
+\r
+Previously such errors were simply ignored. Now they cause an\r
+immediate cleanup and abort.\r
+---\r
+ notmuch-new.c | 25 +++++++++++++++++++------\r
+ 1 files changed, 19 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index 15c0b36..2faf2f8 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -785,8 +785,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
+@@ -794,12 +796,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 = NOTMUCH_STATUS_SUCCESS;\r
+ notmuch_directory_t *directory;\r
+ notmuch_filenames_t *files, *subdirs;\r
+ char *absolute;\r
+@@ -812,8 +815,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
++ goto DONE;\r
+ }\r
+ \r
+ for (subdirs = notmuch_directory_get_child_directories (directory);\r
+@@ -822,11 +827,15 @@ _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
++ goto DONE;\r
+ }\r
+ \r
++ DONE:\r
+ notmuch_directory_destroy (directory);\r
++ return status;\r
+ }\r
+ \r
+ int\r
+@@ -944,7 +953,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
+@@ -955,7 +966,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.9.1\r
+\r
projects / notmuch-archives.git / commitdiff