da/0255c6000cb0b1c4be0fcea03798901f3d4163

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id BECCD431FAF\r
   6         for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:36:22 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 46QNNYjeAnQA for <notmuch@notmuchmail.org>;\r
  16         Sun, 22 Apr 2012 08:36:20 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
  18         [18.9.25.15])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 6C896431FAE\r
  20         for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:36:20 -0700 (PDT)\r
  21 X-AuditID: 1209190f-b7f8a6d000000914-7d-4f94257355da\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 9B.57.02324.375249F4; Sun, 22 Apr 2012 11:36:19 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q3MFaI8u017529; \r
  27         Sun, 22 Apr 2012 11:36:19 -0400\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3MFaHQB002459\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Sun, 22 Apr 2012 11:36:17 -0400 (EDT)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amdragon@MIT.EDU>)\r
  36         id 1SLypl-0007aF-24; Sun, 22 Apr 2012 11:36:17 -0400\r
  37 Date: Sun, 22 Apr 2012 11:36:17 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Mark Walters <markwalters1009@gmail.com>\r
  40 Subject: Re: [PATCH v2 2/4] new: Handle fatal errors in remove_filename and\r
  41         _remove_directory\r
  42 Message-ID: <20120422153617.GE17810@mit.edu>\r
  43 References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
  44         <1335068868-12593-1-git-send-email-amdragon@mit.edu>\r
  45         <1335068868-12593-3-git-send-email-amdragon@mit.edu>\r
  46         <87aa24kyog.fsf@qmul.ac.uk>\r
  47 MIME-Version: 1.0\r
  48 Content-Type: text/plain; charset=us-ascii\r
  49 Content-Disposition: inline\r
  50 In-Reply-To: <87aa24kyog.fsf@qmul.ac.uk>\r
  51 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  52 X-Brightmail-Tracker:\r
  53  H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42IR4hTV1i1WneJvcPw1h8XquTwW12/OZHZg\r
  54         8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MpaeOMBS8Eek4smCv2wNjJMFuhg5OSQETCRu\r
  55         9JxkhLDFJC7cW8/WxcjFISSwj1FictsidghnA6PE9D1PGSGck0wSM8/dZ4JwljBKPF52lg2k\r
  56         n0VAVeLu8gUsIDabgIbEtv3LweaKCOhI3D60gB3EZhaQlvj2u5kJxBYWiJf4efk9WA0vUM3G\r
  57         i9eh1p1mlPjzdx87REJQ4uTMJywQzVoSN/69BGrmABu0/B8HSJgTaNeZE/fAykUFVCSmnNzG\r
  58         NoFRaBaS7llIumchdC9gZF7FKJuSW6Wbm5iZU5yarFucnJiXl1qka6KXm1mil5pSuokRHNiS\r
  59         /DsYvx1UOsQowMGoxMP7ymSyvxBrYllxZe4hRkkOJiVRXi+lKf5CfEn5KZUZicUZ8UWlOanF\r
  60         hxglOJiVRHg/iwCV86YkVlalFuXDpKQ5WJTEedW03vkJCaQnlqRmp6YWpBbBZGU4OJQkeNeq\r
  61         AA0VLEpNT61Iy8wpQUgzcXCCDOcBGr4BpIa3uCAxtzgzHSJ/ilFRSpx3I0hCACSRUZoH1wtL\r
  62         PK8YxYFeEeY9D1LFA0xacN2vgAYzAQ1OiJkEMrgkESEl1cC4MPiWkU7h+5TO3y8rPh+ddPOn\r
  63         /AJzb8+s0x0s1qZN06Pql81S6dd6Wrbd3Ox81c4dT084P3UsNgvYbPJa2fXsjlXVP3l7T/7X\r
  64         rJnkUrp/hzrL4Vle3r/kWWv1Zl7327Op4QKz/NRFM90//ufrlPtatoshrCvOU9zeU2h5TXHG\r
  65         cnav97yv9zorsRRnJBpqMRcVJwIAFpHCcxcDAAA=\r
  66 Cc: notmuch@notmuchmail.org\r
  67 X-BeenThere: notmuch@notmuchmail.org\r
  68 X-Mailman-Version: 2.1.13\r
  69 Precedence: list\r
  70 List-Id: "Use and development of the notmuch mail system."\r
  71         <notmuch.notmuchmail.org>\r
  72 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  74 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  75 List-Post: <mailto:notmuch@notmuchmail.org>\r
  76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  77 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  78         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  79 X-List-Received-Date: Sun, 22 Apr 2012 15:36:22 -0000\r
  80 \r
  81 Quoth Mark Walters on Apr 22 at  8:34 am:\r
  82 > On Sun, 22 Apr 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
  83 > > Previously such errors were simply ignored.  Now they cause an\r
  84 > > immediate cleanup and abort.\r
  85 > > ---\r
  86 > >  notmuch-new.c |   25 +++++++++++++++++++------\r
  87 > >  1 files changed, 19 insertions(+), 6 deletions(-)\r
  88 > >\r
  89 > > diff --git a/notmuch-new.c b/notmuch-new.c\r
  90 > > index 15c0b36..92e0489 100644\r
  91 > > --- a/notmuch-new.c\r
  92 > > +++ b/notmuch-new.c\r
  93 > > @@ -785,8 +785,10 @@ remove_filename (notmuch_database_t *notmuch,\r
  94 > >     add_files_state->renamed_messages++;\r
  95 > >     if (add_files_state->synchronize_flags == TRUE)\r
  96 > >         notmuch_message_maildir_flags_to_tags (message);\r
  97 > > -    } else\r
  98 > > +   status = NOTMUCH_STATUS_SUCCESS;\r
  99 > > +    } else if (status == NOTMUCH_STATUS_SUCCESS) {\r
 100 > >     add_files_state->removed_messages++;\r
 101 > > +    }\r
 102 > >      notmuch_message_destroy (message);\r
 103 > >      notmuch_database_end_atomic (notmuch);\r
 104 > >      return status;\r
 105 > > @@ -794,12 +796,13 @@ remove_filename (notmuch_database_t *notmuch,\r
 106 > >  \r
 107 > >  /* Recursively remove all filenames from the database referring to\r
 108 > >   * 'path' (or to any of its children). */\r
 109 > > -static void\r
 110 > > +static notmuch_status_t\r
 111 > >  _remove_directory (void *ctx,\r
 112 > >                notmuch_database_t *notmuch,\r
 113 > >                const char *path,\r
 114 > >                add_files_state_t *add_files_state)\r
 115 > >  {\r
 116 > > +    notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;\r
 117 > >      notmuch_directory_t *directory;\r
 118 > >      notmuch_filenames_t *files, *subdirs;\r
 119 > >      char *absolute;\r
 120 > > @@ -812,8 +815,10 @@ _remove_directory (void *ctx,\r
 121 > >      {\r
 122 > >     absolute = talloc_asprintf (ctx, "%s/%s", path,\r
 123 > >                                 notmuch_filenames_get (files));\r
 124 > > -   remove_filename (notmuch, absolute, add_files_state);\r
 125 > > +   status = remove_filename (notmuch, absolute, add_files_state);\r
 126 > >     talloc_free (absolute);\r
 127 > > +   if (status)\r
 128 > > +       goto DONE;\r
 129 > >      }\r
 130 > >  \r
 131 > >      for (subdirs = notmuch_directory_get_child_directories (directory);\r
 132 > > @@ -822,11 +827,15 @@ _remove_directory (void *ctx,\r
 133 > >      {\r
 134 > >     absolute = talloc_asprintf (ctx, "%s/%s", path,\r
 135 > >                                 notmuch_filenames_get (subdirs));\r
 136 > > -   _remove_directory (ctx, notmuch, absolute, add_files_state);\r
 137 > > +   status = _remove_directory (ctx, notmuch, absolute, add_files_state);\r
 138 > >     talloc_free (absolute);\r
 139 > > +   if (status)\r
 140 > > +       goto DONE;\r
 141 > >      }\r
 142 > >  \r
 143 > > +  DONE:\r
 144 > >      notmuch_directory_destroy (directory);\r
 145 > > +    return NOTMUCH_STATUS_SUCCESS;\r
 146 > \r
 147 > Doesn't this need to be return status or something?\r
 148 \r
 149 Arrg.  Yes, of course.  I wish I knew a good way to test this stuff.\r