X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=b8486f7d5271771648ef0ff1ec71c8887a43b391;hp=5e86955d8dfd91b3880a5d53217b9265eb69c65e;hb=a352d9ceaa7e08b7c9de294419ec4c323b81ca15;hpb=2501c2565ccca19e3e49fa1594aaa90f04e37d6d

diff --git a/lib/database.cc b/lib/database.cc
index 5e86955d..b8486f7d 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1635,6 +1635,9 @@ notmuch_database_begin_atomic (notmuch_database_t *notmuch)
 	notmuch->atomic_nesting > 0)
 	goto DONE;
 
+	if (notmuch_database_needs_upgrade(notmuch))
+		return NOTMUCH_STATUS_UPGRADE_REQUIRED;
+
     try {
 	(static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->begin_transaction (false);
     } catch (const Xapian::Error &error) {
@@ -1778,7 +1781,7 @@ _notmuch_database_split_path (void *ctx,
 
     /* Finally, skip multiple slashes. */
     while (slash != path) {
-	if (*slash != '/')
+	if (*(slash - 1) != '/')
 	    break;
 
 	--slash;
@@ -1791,7 +1794,7 @@ _notmuch_database_split_path (void *ctx,
 	    *basename = path;
     } else {
 	if (directory)
-	    *directory = talloc_strndup (ctx, path, slash - path + 1);
+	    *directory = talloc_strndup (ctx, path, slash - path);
     }
 
     return NOTMUCH_STATUS_SUCCESS;