[PATCH 7/9] lib: Make notmuch_database_find_message_by_filename not crash on read...

diff --git a/1d/ca96795fd7bba7d5f4e6e420589dea14b20cb1 b/1d/ca96795fd7bba7d5f4e6e420589dea14b20cb1
new file mode 100644 (file)
index 0000000..3c226c1
--- /dev/null
+++ b/1d/ca96795fd7bba7d5f4e6e420589dea14b20cb1
@@ -0,0 +1,101 @@
+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 BF82A429E36\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:58 -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 9ZGC7s0Fsyse for <notmuch@notmuchmail.org>;\r
+       Thu, 17 May 2012 21:13:57 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+       [18.7.68.35])\r
+       by olra.theworths.org (Postfix) with ESMTP id 588D0431E82\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:53 -0700 (PDT)\r
+X-AuditID: 12074423-b7fcc6d0000008a8-38-4fb5cc8089a0\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 10.83.02216.08CC5BF4; Fri, 18 May 2012 00:13:52 -0400 (EDT)\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 q4I4Dq4Y029945; \r
+       Fri, 18 May 2012 00:13:52 -0400\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 q4I4Dpi4026792\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 18 May 2012 00:13:51 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SVEZa-0000zF-U8; Fri, 18 May 2012 00:13:50 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 7/9] lib: Make notmuch_database_find_message_by_filename not\r
+       crash on read-only databases\r
+Date: Fri, 18 May 2012 00:13:40 -0400\r
+Message-Id: <1337314423-3702-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
+References: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrNtwZqu/wYw5xhbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxo+jG9kLrrBXrP/3i6WBcSVbFyMnh4SAiUT37m52CFtM4sK9\r
+       9UBxLg4hgX2MEgcvNkI5GxglPvxexALh3GeSmPduM1RmFqPE7Y7PjCD9bAIaEtv2LwezRQSk\r
+       JXbenc3axcjBwSygJvGnSwUkLCyQKdF7/SkriM0ioCpx9d5qJhCbV8BeYvuhtVAnyUs8vd/H\r
+       BtLKKeAgMe14NEhYCKjk34VmlgmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpmunlZpbo\r
+       paaUbmIEBQ27i/IOxj8HlQ4xCnAwKvHw7piz1V+INbGsuDL3EKMkB5OSKO/3k0AhvqT8lMqM\r
+       xOKM+KLSnNTiQ4wSHMxKIryy3UA53pTEyqrUonyYlDQHi5I4r4bWOz8hgfTEktTs1NSC1CKY\r
+       rAwHh5IE76bTQI2CRanpqRVpmTklCGkmDk6Q4TxAwzNBaniLCxJzizPTIfKnGBWlxHl3gyQE\r
+       QBIZpXlwvbCofsUoDvSKMO9ZkCoeYEKA634FNJgJaHBZ7iaQwSWJCCmpBsbkiafyDpQELHR0\r
+       P+ctbdxSoG4bJnnpluUChfmGGeKK11RzgsOu1R4XsZxqIPHHX+DLxF2mswUF9VSmtRRtjd2j\r
+       N8nhxnsxf6skrZ9ZOssPSbyZYlH/PO/41vnWq7uPKiueZNH81hs8l33vstdTfgRUXbuwd6nP\r
+       8VU3r6lEr1m8of3ABslYGSElluKMREMt5qLiRADnP3UgxQIAAA==\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: Fri, 18 May 2012 04:13:59 -0000\r
+\r
+Previously, _notmuch_database_filename_to_direntry would abort with an\r
+internal error when called on a read-only database.  Now that creating\r
+the directory document is optional,\r
+notmuch_database_find_message_by_filename can disable directory\r
+document creation (as it should) and, as a result, not abort on\r
+read-only databases.\r
+---\r
+ lib/database.cc |    4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index e27a0e1..761dc1a 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1895,8 +1895,8 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,\r
+ \r
+     try {\r
+       status = _notmuch_database_filename_to_direntry (\r
+-          local, notmuch, filename, NOTMUCH_FIND_CREATE, &direntry);\r
+-      if (status)\r
++          local, notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry);\r
++      if (status || !direntry)\r
+           goto DONE;\r
+ \r
+       term = talloc_asprintf (local, "%s%s", prefix, direntry);\r
+-- \r
+1.7.10\r
+\r