Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id BF82A429E36 for ; Thu, 17 May 2012 21:13:58 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9ZGC7s0Fsyse for ; Thu, 17 May 2012 21:13:57 -0700 (PDT) Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU [18.7.68.35]) by olra.theworths.org (Postfix) with ESMTP id 588D0431E82 for ; Thu, 17 May 2012 21:13:53 -0700 (PDT) X-AuditID: 12074423-b7fcc6d0000008a8-38-4fb5cc8089a0 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP id 10.83.02216.08CC5BF4; Fri, 18 May 2012 00:13:52 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4I4Dq4Y029945; Fri, 18 May 2012 00:13:52 -0400 Received: from drake.mit.edu (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4I4Dpi4026792 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Fri, 18 May 2012 00:13:51 -0400 (EDT) Received: from amthrax by drake.mit.edu with local (Exim 4.77) (envelope-from ) id 1SVEZa-0000zF-U8; Fri, 18 May 2012 00:13:50 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 7/9] lib: Make notmuch_database_find_message_by_filename not crash on read-only databases Date: Fri, 18 May 2012 00:13:40 -0400 Message-Id: <1337314423-3702-8-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1337314423-3702-1-git-send-email-amdragon@mit.edu> References: <1337314423-3702-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrNtwZqu/wYw5xhbXb85kdmD0eLbq FnMAYxSXTUpqTmZZapG+XQJXxo+jG9kLrrBXrP/3i6WBcSVbFyMnh4SAiUT37m52CFtM4sK9 9UBxLg4hgX2MEgcvNkI5GxglPvxexALh3GeSmPduM1RmFqPE7Y7PjCD9bAIaEtv2LwezRQSk JXbenc3axcjBwSygJvGnSwUkLCyQKdF7/SkriM0ioCpx9d5qJhCbV8BeYvuhtVAnyUs8vd/H BtLKKeAgMe14NEhYCKjk34VmlgmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpmunlZpbo paaUbmIEBQ27i/IOxj8HlQ4xCnAwKvHw7piz1V+INbGsuDL3EKMkB5OSKO/3k0AhvqT8lMqM xOKM+KLSnNTiQ4wSHMxKIryy3UA53pTEyqrUonyYlDQHi5I4r4bWOz8hgfTEktTs1NSC1CKY rAwHh5IE76bTQI2CRanpqRVpmTklCGkmDk6Q4TxAwzNBaniLCxJzizPTIfKnGBWlxHl3gyQE QBIZpXlwvbCofsUoDvSKMO9ZkCoeYEKA634FNJgJaHBZ7iaQwSWJCCmpBsbkiafyDpQELHR0 P+ctbdxSoG4bJnnpluUChfmGGeKK11RzgsOu1R4XsZxqIPHHX+DLxF2mswUF9VSmtRRtjd2j N8nhxnsxf6skrZ9ZOssPSbyZYlH/PO/41vnWq7uPKiueZNH81hs8l33vstdTfgRUXbuwd6nP 8VU3r6lEr1m8of3ABslYGSElluKMREMt5qLiRADnP3UgxQIAAA== X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2012 04:13:59 -0000 Previously, _notmuch_database_filename_to_direntry would abort with an internal error when called on a read-only database. Now that creating the directory document is optional, notmuch_database_find_message_by_filename can disable directory document creation (as it should) and, as a result, not abort on read-only databases. --- lib/database.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index e27a0e1..761dc1a 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -1895,8 +1895,8 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch, try { status = _notmuch_database_filename_to_direntry ( - local, notmuch, filename, NOTMUCH_FIND_CREATE, &direntry); - if (status) + local, notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry); + if (status || !direntry) goto DONE; term = talloc_asprintf (local, "%s%s", prefix, direntry); -- 1.7.10