--- /dev/null
+Return-Path: <amdragon@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 C5B75431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:21:09 -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 KOAH1xXFdPbL for <notmuch@notmuchmail.org>;\r
+ Sat, 21 Apr 2012 21:21:09 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id F06AB431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:21:08 -0700 (PDT)\r
+X-AuditID: 12074422-b7fd66d0000008f9-10-4f938733c3d6\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id E2.54.02297.337839F4; Sun, 22 Apr 2012 00:21:07 -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 q3M4L65m014648; \r
+ Sun, 22 Apr 2012 00:21:07 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (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 q3M4L5ig010696\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 22 Apr 2012 00:21:06 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SLoIL-0005S4-B7; Sun, 22 Apr 2012 00:21:05 -0400\r
+Date: Sun, 22 Apr 2012 00:21:05 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH 2/3] new: Handle fatal errors in remove_filename and\r
+ _remove_directory\r
+Message-ID: <20120422042105.GB17810@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+ <1330357759-1337-3-git-send-email-amdragon@mit.edu>\r
+ <87wr5f4qci.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <87wr5f4qci.fsf@qmul.ac.uk>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hTV1jVun+xvsHeWlMXquTwW12/OZHZg\r
+ 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mt5f3MFUMEWx4vSeRsYGxquSXYycHBICJhKr\r
+ r6xjhLDFJC7cW8/WxcjFISSwj1Fiyul7LBDOBkaJv7duMYNUCQmcZJKYfUMSIrGEUWLa/l6w\r
+ BIuAqsTU7e/ZQWw2AQ2JbfuXg40VEdCRuH1oAVicWUBa4tvvZiYQW1ggRmJxwwowmxeo5sSp\r
+ 2YwQQycDDW06yQKREJQ4OfMJC0SzlsSNfy+BGjjABi3/xwES5gTatazrH1iJqICKxJST29gm\r
+ MArNQtI9C0n3LITuBYzMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3RN9XIzS/RSU0o3MYLCmt1F\r
+ aQfjz4NKhxgFOBiVeHhfmUz2F2JNLCuuzD3EKMnBpCTKq18JFOJLyk+pzEgszogvKs1JLT7E\r
+ KMHBrCTC+1kEKMebklhZlVqUD5OS5mBREudV13rnJySQnliSmp2aWpBaBJOV4eBQkuBNaANq\r
+ FCxKTU+tSMvMKUFIM3FwggznARruCFLDW1yQmFucmQ6RP8WoKCXOmw+SEABJZJTmwfXC0s4r\r
+ RnGgV4R5fUGqeIApC677FdBgJqDBCTGTQAaXJCKkpBoYq1+vXe+X73fY9H7zj1vFCsUt4qIV\r
+ e26oHt/m/0v62PO6kEl+mWlOuhfcl+w4znSypmgNl55znUzllh8zb9xuurDa4Hvz4sv3JjZl\r
+ RPafilk3SUdMIlYnYj+Xm2ZBbmjhBLucyP3zvs2VOJzw+0Dv60Mlq5S2MZ9l1zy2/fyHZI7p\r
+ gevlC1wblFiKMxINtZiLihMBN4SMshYDAAA=\r
+Cc: notmuch@notmuchmail.org\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 04:21:09 -0000\r
+\r
+Quoth Mark Walters on Apr 16 at 5:02 pm:\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
+Good point. I've fixed this to use the usual goto DONE cleanup idiom.\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
+Yes, they should be. I've added a patch to fix that.\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
projects / notmuch-archives.git / commitdiff