Re: [PATCH v2 2/4] new: Handle fatal errors in remove_filename and _remove_directory

diff --git a/da/0255c6000cb0b1c4be0fcea03798901f3d4163 b/da/0255c6000cb0b1c4be0fcea03798901f3d4163
new file mode 100644 (file)
index 0000000..fcc3ee8
--- /dev/null
+++ b/da/0255c6000cb0b1c4be0fcea03798901f3d4163
@@ -0,0 +1,149 @@
+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 BECCD431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:36:22 -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 46QNNYjeAnQA for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Apr 2012 08:36:20 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6C896431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:36:20 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f8a6d000000914-7d-4f94257355da\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 9B.57.02324.375249F4; Sun, 22 Apr 2012 11:36:19 -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 q3MFaI8u017529; \r
+       Sun, 22 Apr 2012 11:36:19 -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 q3MFaHQB002459\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 22 Apr 2012 11:36:17 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@MIT.EDU>)\r
+       id 1SLypl-0007aF-24; Sun, 22 Apr 2012 11:36:17 -0400\r
+Date: Sun, 22 Apr 2012 11:36:17 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH v2 2/4] new: Handle fatal errors in remove_filename and\r
+       _remove_directory\r
+Message-ID: <20120422153617.GE17810@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+       <1335068868-12593-1-git-send-email-amdragon@mit.edu>\r
+       <1335068868-12593-3-git-send-email-amdragon@mit.edu>\r
+       <87aa24kyog.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: <87aa24kyog.fsf@qmul.ac.uk>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42IR4hTV1i1WneJvcPw1h8XquTwW12/OZHZg\r
+       8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MpaeOMBS8Eek4smCv2wNjJMFuhg5OSQETCRu\r
+       9JxkhLDFJC7cW8/WxcjFISSwj1FictsidghnA6PE9D1PGSGck0wSM8/dZ4JwljBKPF52lg2k\r
+       n0VAVeLu8gUsIDabgIbEtv3LweaKCOhI3D60gB3EZhaQlvj2u5kJxBYWiJf4efk9WA0vUM3G\r
+       i9eh1p1mlPjzdx87REJQ4uTMJywQzVoSN/69BGrmABu0/B8HSJgTaNeZE/fAykUFVCSmnNzG\r
+       NoFRaBaS7llIumchdC9gZF7FKJuSW6Wbm5iZU5yarFucnJiXl1qka6KXm1mil5pSuokRHNiS\r
+       /DsYvx1UOsQowMGoxMP7ymSyvxBrYllxZe4hRkkOJiVRXi+lKf5CfEn5KZUZicUZ8UWlOanF\r
+       hxglOJiVRHg/iwCV86YkVlalFuXDpKQ5WJTEedW03vkJCaQnlqRmp6YWpBbBZGU4OJQkeNeq\r
+       AA0VLEpNT61Iy8wpQUgzcXCCDOcBGr4BpIa3uCAxtzgzHSJ/ilFRSpx3I0hCACSRUZoH1wtL\r
+       PK8YxYFeEeY9D1LFA0xacN2vgAYzAQ1OiJkEMrgkESEl1cC4MPiWkU7h+5TO3y8rPh+ddPOn\r
+       /AJzb8+s0x0s1qZN06Pql81S6dd6Wrbd3Ox81c4dT084P3UsNgvYbPJa2fXsjlXVP3l7T/7X\r
+       rJnkUrp/hzrL4Vle3r/kWWv1Zl7327Op4QKz/NRFM90//ufrlPtatoshrCvOU9zeU2h5TXHG\r
+       cnav97yv9zorsRRnJBpqMRcVJwIAFpHCcxcDAAA=\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 15:36:22 -0000\r
+\r
+Quoth Mark Walters on Apr 22 at  8:34 am:\r
+> On Sun, 22 Apr 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
+> >  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..92e0489 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 NOTMUCH_STATUS_SUCCESS;\r
+> \r
+> Doesn't this need to be return status or something?\r
+\r
+Arrg.  Yes, of course.  I wish I knew a good way to test this stuff.\r