X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lib%2Fopen.cc;h=7fc9a14ffbb8d9608eb2f55c319118b54afe89f2;hb=6251e2bb9ee023d25b58384c8a49576086fdaba3;hp=8bd73d6aec7e01c477e9e08cb84b105439ff27c7;hpb=1383481d4a7cee3b59f354a203090c966a2a635e;p=notmuch diff --git a/lib/open.cc b/lib/open.cc index 8bd73d6a..7fc9a14f 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -209,6 +209,17 @@ _alloc_notmuch () return notmuch; } +static void +_set_database_path (notmuch_database_t *notmuch, + const char *database_path) +{ + char *path = talloc_strdup (notmuch, database_path); + + strip_trailing (path, '/'); + + _notmuch_config_cache (notmuch, NOTMUCH_CONFIG_DATABASE_PATH, path); +} + notmuch_status_t notmuch_database_open_with_config (const char *database_path, notmuch_database_mode_t mode, @@ -238,8 +249,7 @@ notmuch_database_open_with_config (const char *database_path, &key_file, &database_path, &message))) goto DONE; - notmuch->path = talloc_strdup (notmuch, database_path); - strip_trailing (notmuch->path, '/'); + _set_database_path (notmuch, database_path); if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) { message = strdup ("Out of memory\n");