1e/f3ce4e0afb0f501e554184f3282edbcffed8d6

   1 Return-Path: <amthrax@drake.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 ADC8A431FB6\r
   6         for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:50:59 -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 Gdl5Y9FMsNdb for <notmuch@notmuchmail.org>;\r
  16         Sun, 22 Apr 2012 08:50:58 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 81EF8431FBD\r
  20         for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:50:58 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7fae6d000000906-f4-4f9428e29453\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 9D.8B.02310.2E8249F4; Sun, 22 Apr 2012 11:50:58 -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 q3MFovDI018620; \r
  27         Sun, 22 Apr 2012 11:50:57 -0400\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3MFou1h003693\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 22 Apr 2012 11:50:57 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1SLz3w-0002fD-F0; Sun, 22 Apr 2012 11:50:56 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v3 2/4] new: Handle fatal errors in remove_filename and\r
  41         _remove_directory\r
  42 Date: Sun, 22 Apr 2012 11:50:50 -0400\r
  43 Message-Id: <1335109852-10150-3-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.9.1\r
  45 In-Reply-To: <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
  47         <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrftIY4q/wck9bBbXb85kdmD0eLbq\r
  50         FnMAYxSXTUpqTmZZapG+XQJXxrl1T5kKfktULDw+hbWB8atwFyMnh4SAicTv1m4WCFtM4sK9\r
  51         9WxdjFwcQgL7GCU2Pr7HDuFsYJQ48PY3K4Rzn0li7bMJUGXzGSXWvXsO1s8moCGxbf9yRhBb\r
  52         REBaYufd2UAdHBzMAmoSf7pUQMLCApESFz7+ZQIJswioSrQ8CwcJ8wo4SNx50cEEcYWCxLN1\r
  53         x8FsTgFHiY/vVoLZQgJlEt/mvWWfwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5qka65Xm5m\r
  54         iV5qSukmRlDQsLuo7GBsPqR0iFGAg1GJh/eVyWR/IdbEsuLK3EOMkhxMSqK8bmpT/IX4kvJT\r
  55         KjMSizPii0pzUosPMUpwMCuJ8H4WASrnTUmsrEotyodJSXOwKInzami98xMSSE8sSc1OTS1I\r
  56         LYLJynBwKEnwmgOjQ0iwKDU9tSItM6cEIc3EwQkynAdouDVIDW9xQWJucWY6RP4Uo6KUOK8y\r
  57         SEIAJJFRmgfXC4vqV4ziQK8I84aAVPEAEwJc9yugwUxAgxNiJoEMLklESEk1MKZX2ZyedSIq\r
  58         pGWVlesC1SsB87d0ZJst6dibI6Bry/fv9M7Z7bOP7b8gub1K+fHF4IeMdT+lV0jP7/oxK/Bh\r
  59         WPNW0ydaBcdWBZyQurc3nt2sx5H1WvGVzNCG7JAvd5iWSYafZNx3vV3jkmbofEFesbUrBCyN\r
  60         esztRP8fu+zxSPUw07eKZXfik5RYijMSDbWYi4oTAWJL7HzFAgAA\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Sun, 22 Apr 2012 15:51:00 -0000\r
  74 \r
  75 Previously such errors were simply ignored.  Now they cause an\r
  76 immediate cleanup and abort.\r
  77 ---\r
  78  notmuch-new.c |   25 +++++++++++++++++++------\r
  79  1 files changed, 19 insertions(+), 6 deletions(-)\r
  80 \r
  81 diff --git a/notmuch-new.c b/notmuch-new.c\r
  82 index 15c0b36..2faf2f8 100644\r
  83 --- a/notmuch-new.c\r
  84 +++ b/notmuch-new.c\r
  85 @@ -785,8 +785,10 @@ remove_filename (notmuch_database_t *notmuch,\r
  86         add_files_state->renamed_messages++;\r
  87         if (add_files_state->synchronize_flags == TRUE)\r
  88             notmuch_message_maildir_flags_to_tags (message);\r
  89 -    } else\r
  90 +       status = NOTMUCH_STATUS_SUCCESS;\r
  91 +    } else if (status == NOTMUCH_STATUS_SUCCESS) {\r
  92         add_files_state->removed_messages++;\r
  93 +    }\r
  94      notmuch_message_destroy (message);\r
  95      notmuch_database_end_atomic (notmuch);\r
  96      return status;\r
  97 @@ -794,12 +796,13 @@ remove_filename (notmuch_database_t *notmuch,\r
  98  \r
  99  /* Recursively remove all filenames from the database referring to\r
 100   * 'path' (or to any of its children). */\r
 101 -static void\r
 102 +static notmuch_status_t\r
 103  _remove_directory (void *ctx,\r
 104                    notmuch_database_t *notmuch,\r
 105                    const char *path,\r
 106                    add_files_state_t *add_files_state)\r
 107  {\r
 108 +    notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;\r
 109      notmuch_directory_t *directory;\r
 110      notmuch_filenames_t *files, *subdirs;\r
 111      char *absolute;\r
 112 @@ -812,8 +815,10 @@ _remove_directory (void *ctx,\r
 113      {\r
 114         absolute = talloc_asprintf (ctx, "%s/%s", path,\r
 115                                     notmuch_filenames_get (files));\r
 116 -       remove_filename (notmuch, absolute, add_files_state);\r
 117 +       status = remove_filename (notmuch, absolute, add_files_state);\r
 118         talloc_free (absolute);\r
 119 +       if (status)\r
 120 +           goto DONE;\r
 121      }\r
 122  \r
 123      for (subdirs = notmuch_directory_get_child_directories (directory);\r
 124 @@ -822,11 +827,15 @@ _remove_directory (void *ctx,\r
 125      {\r
 126         absolute = talloc_asprintf (ctx, "%s/%s", path,\r
 127                                     notmuch_filenames_get (subdirs));\r
 128 -       _remove_directory (ctx, notmuch, absolute, add_files_state);\r
 129 +       status = _remove_directory (ctx, notmuch, absolute, add_files_state);\r
 130         talloc_free (absolute);\r
 131 +       if (status)\r
 132 +           goto DONE;\r
 133      }\r
 134  \r
 135 +  DONE:\r
 136      notmuch_directory_destroy (directory);\r
 137 +    return status;\r
 138  }\r
 139  \r
 140  int\r
 141 @@ -944,7 +953,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
 142  \r
 143      gettimeofday (&tv_start, NULL);\r
 144      for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {\r
 145 -       remove_filename (notmuch, f->filename, &add_files_state);\r
 146 +       ret = remove_filename (notmuch, f->filename, &add_files_state);\r
 147 +       if (ret)\r
 148 +           goto DONE;\r
 149         if (do_print_progress) {\r
 150             do_print_progress = 0;\r
 151             generic_print_progress ("Cleaned up", "messages",\r
 152 @@ -955,7 +966,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
 153  \r
 154      gettimeofday (&tv_start, NULL);\r
 155      for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {\r
 156 -       _remove_directory (ctx, notmuch, f->filename, &add_files_state);\r
 157 +       ret = _remove_directory (ctx, notmuch, f->filename, &add_files_state);\r
 158 +       if (ret)\r
 159 +           goto DONE;\r
 160         if (do_print_progress) {\r
 161             do_print_progress = 0;\r
 162             generic_print_progress ("Cleaned up", "directories",\r
 163 -- \r
 164 1.7.9.1\r
 165 \r