[PATCH 1/3] new: Consistently treat fatal errors as fatal

diff --git a/15/763283549dccec71ac6b658f2fcc5ef617a779 b/15/763283549dccec71ac6b658f2fcc5ef617a779
new file mode 100644 (file)
index 0000000..6fd9935
--- /dev/null
+++ b/15/763283549dccec71ac6b658f2fcc5ef617a779
@@ -0,0 +1,138 @@
+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 8AD80431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 27 Feb 2012 07:49:28 -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 13GGVoeR7E+t 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 EC3FF431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 27 Feb 2012 07:49:27 -0800 (PST)\r
+X-AuditID: 1209190c-b7fad6d000000920-f2-4f4ba60796e9\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 31.13.02336.706AB4F4; Mon, 27 Feb 2012 10:49:27 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1RFnQsS006846; \r
+       Mon, 27 Feb 2012 10:49:26 -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 q1RFnPsb003382\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 27 Feb 2012 10:49:26 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S22pJ-0000N6-8v; Mon, 27 Feb 2012 10:49:25 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] new: Consistently treat fatal errors as fatal\r
+Date: Mon, 27 Feb 2012 10:49:17 -0500\r
+Message-Id: <1330357759-1337-2-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+NgFtrMIsWRmVeSWpSXmKPExsUixCmqrMu+zNvf4OI1aYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEr48ra7YwFjQIVf/YcZmlgPM7TxcjJISFgIvH/9z1WCFtM4sK9\r
+       9WxdjFwcQgL7GCXeXmlkgnA2MEr8X3SdBcK5zyRxacd+qLL5jBKH2jsZQfrZBDQktu1fDmaL\r
+       CEhL7Lw7G2guBwezgJrEny4VkLCwgJPEocc/mUBsFgFViRvP5rKB2LwC9hJPl96HOkNB4tzq\r
+       c+wgNqeAg8TLNX/BaoSAahadO8M8gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl1DvdzM\r
+       Er3UlNJNjOCwkeTZwfjmoNIhRgEORiUe3qJZ3v5CrIllxZW5hxglOZiURHk9lwCF+JLyUyoz\r
+       Eosz4otKc1KLDzFKcDArifDqZwPleFMSK6tSi/JhUtIcLErivCpa7/yEBNITS1KzU1MLUotg\r
+       sjIcHEoSvAJLgRoFi1LTUyvSMnNKENJMHJwgw3mAhpuC1PAWFyTmFmemQ+RPMSpKifOygyQE\r
+       QBIZpXlwvbC4fsUoDvSKMK8lSBUPMCXAdb8CGswENDiAE2xwSSJCSqqBkUN3ZdKTzSmMetc4\r
+       dTPnXtK7Zx/2PmC9cOH7eeefG4uw/8v1M7lfVSywaqfja4G55pu3tW15cL5ebG9q2OVF9pkL\r
+       ZkdMN0/6ejxVv/ixcPAnLtVvXlJsupXbPtlqivx7u3JSXrNCRV3J7TWyEfwfsyq+BHecS3jx\r
+       VWhBB49Euo3LJoV9jf8PKrEUZyQaajEXFScCAIOewMDGAgAA\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:28 -0000\r
+\r
+Previously, fatal errors in add_files_recursive were not treated as\r
+fatal by its callers (including itself!) and add_files_recursive\r
+sometimes returned errors on non-fatal conditions.  This makes\r
+add_files_recursive errors consistently fatal and updates all callers\r
+to treat them as fatal.\r
+---\r
+ notmuch-new.c |   13 ++++++++-----\r
+ 1 files changed, 8 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index 4f13535..bd9786a 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -308,7 +308,6 @@ add_files_recursive (notmuch_database_t *notmuch,\r
+     if (num_fs_entries == -1) {\r
+       fprintf (stderr, "Error opening directory %s: %s\n",\r
+                path, strerror (errno));\r
+-      ret = NOTMUCH_STATUS_FILE_ERROR;\r
+       goto DONE;\r
+     }\r
+ \r
+@@ -351,8 +350,10 @@ add_files_recursive (notmuch_database_t *notmuch,\r
+ \r
+       next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);\r
+       status = add_files_recursive (notmuch, next, state);\r
+-      if (status && ret == NOTMUCH_STATUS_SUCCESS)\r
++      if (status) {\r
+           ret = status;\r
++          goto DONE;\r
++      }\r
+       talloc_free (next);\r
+       next = NULL;\r
+     }\r
+@@ -933,6 +934,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+     }\r
+ \r
+     ret = add_files (notmuch, db_path, &add_files_state);\r
++    if (ret)\r
++      goto DONE;\r
+ \r
+     gettimeofday (&tv_start, NULL);\r
+     for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {\r
+@@ -965,6 +968,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+       }\r
+     }\r
+ \r
++  DONE:\r
+     talloc_free (add_files_state.removed_files);\r
+     talloc_free (add_files_state.removed_directories);\r
+     talloc_free (add_files_state.directory_mtimes);\r
+@@ -1012,10 +1016,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+ \r
+     printf ("\n");\r
+ \r
+-    if (ret) {\r
+-      printf ("\nNote: At least one error was encountered: %s\n",\r
++    if (ret)\r
++      printf ("\nNote: A fatal error was encountered: %s\n",\r
+               notmuch_status_to_string (ret));\r
+-    }\r
+ \r
+     notmuch_database_close (notmuch);\r
+ \r
+-- \r
+1.7.7.3\r
+\r