From: Austin Clements <amdragon@MIT.EDU>
Date: Fri, 18 May 2012 04:13:40 +0000 (-0400)
Subject: lib: Make notmuch_database_find_message_by_filename not crash on read-only databases
X-Git-Tag: 0.13.1~9
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=cdd698f96976dc8fc43efd19c452d0fca48e2618

lib: Make notmuch_database_find_message_by_filename not crash on read-only databases

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.
---

diff --git a/lib/database.cc b/lib/database.cc
index e27a0e16..761dc1a2 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);