From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gMlsOtF4LWBvEQAA0tVLHw (envelope-from ) for ; Wed, 17 Feb 2021 20:13:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eCp8NtF4LWDvZAAAB5/wlQ (envelope-from ) for ; Wed, 17 Feb 2021 20:13:05 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 80451214EF for ; Wed, 17 Feb 2021 21:13:05 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8904727075; Wed, 17 Feb 2021 15:11:45 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 9452626ADC for ; Wed, 17 Feb 2021 15:11:11 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 8DFF36067D; Wed, 17 Feb 2021 15:11:11 -0500 (EST) Received: (nullmailer pid 2021430 invoked by uid 1000); Wed, 17 Feb 2021 20:10:50 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 12/21] lib/open: Use check for existing database by trial opening Date: Wed, 17 Feb 2021 16:10:36 -0400 Message-Id: <20210217201045.2021106-13-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210217201045.2021106-1-david@tethera.net> References: <20210217201045.2021106-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: BPARTSW6TKNKUHF7LWA6AFIU3RKV5XIE X-Message-ID-Hash: BPARTSW6TKNKUHF7LWA6AFIU3RKV5XIE X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.56 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 80451214EF X-Spam-Score: 0.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: j/GQTTMSEz8v This is a bit heavyweight for now, but it will make more sense when we check multiple locations for the xapian database. --- lib/open.cc | 67 +++++++++++++++++++++++++++----------- test/T360-symbol-hiding.sh | 2 +- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index ebf70c15..4e8ab3b4 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -223,6 +223,49 @@ notmuch_database_t * _alloc_notmuch() { return notmuch; } +static notmuch_status_t +_trial_open (const char *xapian_path, char **message_ptr) +{ + try { + Xapian::Database db(xapian_path); + } catch (const Xapian::DatabaseOpeningError &error) { + IGNORE_RESULT (asprintf (message_ptr, + "Cannot open Xapian database at %s: %s\n", + xapian_path, + error.get_msg ().c_str ())); + return NOTMUCH_STATUS_PATH_ERROR; + } catch (const Xapian::Error &error) { + IGNORE_RESULT (asprintf (message_ptr, + "A Xapian exception occurred opening database: %s\n", + error.get_msg ().c_str ())); + return NOTMUCH_STATUS_XAPIAN_EXCEPTION; + } + return NOTMUCH_STATUS_SUCCESS; +} + +static notmuch_status_t +_choose_xapian_path (void *ctx, const char *database_path, const char **xapian_path, char **message_ptr){ + notmuch_status_t status; + const char *trial_path, *notmuch_path; + + status = _db_dir_exists (database_path, message_ptr); + if (status) + goto DONE; + + notmuch_path = talloc_asprintf (ctx, "%s/.notmuch", database_path); + status = _db_dir_exists (notmuch_path, message_ptr); + if (status) + goto DONE; + + trial_path = talloc_asprintf (ctx, "%s/xapian", notmuch_path); + status = _trial_open (trial_path, message_ptr); + + DONE: + if (status == NOTMUCH_STATUS_SUCCESS) + *xapian_path = trial_path; + return status; +} + static void _set_database_path (notmuch_database_t *notmuch, const char *database_path) { @@ -396,10 +439,7 @@ notmuch_database_open_with_config (const char *database_path, notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; void *local = talloc_new (NULL); notmuch_database_t *notmuch = NULL; - char *notmuch_path; char *message = NULL; - struct stat st; - int err; GKeyFile *key_file = NULL; _init_libs (); @@ -413,26 +453,15 @@ notmuch_database_open_with_config (const char *database_path, if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message))) goto DONE; - _set_database_path (notmuch, database_path); - status = _db_dir_exists (database_path, &message); if (status) - goto DONE; - - if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) { - message = strdup ("Out of memory\n"); - status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; - } - status = _db_dir_exists (notmuch_path, &message); - if (status) - goto DONE; + _set_database_path (notmuch, database_path); - if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) { - status = NOTMUCH_STATUS_OUT_OF_MEMORY; + status = _choose_xapian_path (local, database_path, ¬much->xapian_path, &message); + if (status) goto DONE; - } status = _finish_open (notmuch, profile, mode, key_file, &message); @@ -500,7 +529,7 @@ notmuch_database_create_with_config (const char *database_path, _init_libs (); notmuch = _alloc_notmuch (); - if (!notmuch) { + if (! notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; } @@ -510,7 +539,7 @@ notmuch_database_create_with_config (const char *database_path, status = _db_dir_exists (database_path, &message); if (status) - goto DONE; + goto DONE; _set_database_path (notmuch, database_path); diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh index 729b9d72..642457bf 100755 --- a/test/T360-symbol-hiding.sh +++ b/test/T360-symbol-hiding.sh @@ -17,7 +17,7 @@ $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent 2>&1 \ | notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,No [^[:space:]]* database,No XXXXXX database,g" > OUTPUT cat < EXPECTED -A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian' +Cannot open Xapian database at CWD/fakedb/.notmuch/xapian: Couldn't stat 'CWD/fakedb/.notmuch/xapian' caught No XXXXXX database found at path 'CWD/nonexistent' EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.0