--- /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 90340431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Feb 2012 07:49:29 -0800 (PST)\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 fKDS3jicJpKm for <notmuch@notmuchmail.org>;\r
+ Mon, 27 Feb 2012 07:49:28 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+ [18.9.25.12])\r
+ by olra.theworths.org (Postfix) with ESMTP id 98E1C431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Feb 2012 07:49:28 -0800 (PST)\r
+X-AuditID: 1209190c-b7fad6d000000920-f7-4f4ba6082378\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 71.13.02336.806AB4F4; Mon, 27 Feb 2012 10:49:28 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1RFnRDf000950; \r
+ Mon, 27 Feb 2012 10:49:27 -0500\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 q1RFnQaN003394\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Mon, 27 Feb 2012 10:49:27 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1S22pK-0000N9-9u; Mon, 27 Feb 2012 10:49:26 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] new: Handle fatal errors in remove_filename and\r
+ _remove_directory\r
+Date: Mon, 27 Feb 2012 10:49:18 -0500\r
+Message-Id: <1330357759-1337-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nosuxzNvf4MpWCYvrN2cyOzB6PFt1\r
+ izmAMYrLJiU1J7MstUjfLoEro2P9KsaC9xIV7/d3MDYwvhfuYuTkkBAwkVjxah8LhC0mceHe\r
+ ejYQW0hgH6PEwV86XYxcQPYGRok/E84wQjj3mSTWvV4L5cxnlFh08jwzSAubgIbEtv3LGUFs\r
+ EQFpiZ13Z7N2MXJwMAuoSfzpUgEJCwuESWzrvcAEYrMIqEq8fPuTFcTmFbCXOHR+JzPEFQoS\r
+ 51afYwexOQUcJF6u+Qt1kb3EonNnmCcw8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiXl1qka6iX\r
+ m1mil5pSuokRFDSckjw7GN8cVDrEKMDBqMTDWzTL21+INbGsuDL3EKMkB5OSKK/nEqAQX1J+\r
+ SmVGYnFGfFFpTmrxIUYJDmYlEV79bKAcb0piZVVqUT5MSpqDRUmcV0XrnZ+QQHpiSWp2ampB\r
+ ahFMVoaDQ0mCV2ApUKNgUWp6akVaZk4JQpqJgxNkOA/QcFOQGt7igsTc4sx0iPwpRkUpcV52\r
+ kIQASCKjNA+uFxbVrxjFgV4R5rUEqeIBJgS47ldAg5mABgdwgg0uSURISTUwcvW+Uf/dbzB5\r
+ x6oP2rM4Py960+u1UPvTy/8WE74IiXzc8f/suugrl99E3F68ac10sxkr5KN//z/JrXZo5/oC\r
+ dtcIj3qVyX65+r3c772qBF/9O1L5tuvRpwPSU+snCFt++Hs6f7GcNPsKXwb5z5cXlCd+DT5t\r
+ eoDdJ/9y856N8xazH/z4QuBo9golluKMREMt5qLiRAD7Oz7jxQIAAA==\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, 27 Feb 2012 15:49:29 -0000\r
+\r
+Previously such errors were simply ignored. Now they cause an\r
+immediate cleanup and abort.\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
+ 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
projects / notmuch-archives.git / commitdiff