From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MLlMKSkNRWC8YwAA0tVLHw (envelope-from ) for ; Sun, 07 Mar 2021 17:28:09 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MMIkJSkNRWBKVQAA1q6Kng (envelope-from ) for ; Sun, 07 Mar 2021 17:28:09 +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) server-digest SHA256) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id CE17D1E989 for ; Sun, 7 Mar 2021 18:28:08 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id CEAAA27C7C; Sun, 7 Mar 2021 12:27:50 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 110842757F for ; Sun, 7 Mar 2021 12:27:43 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 08C255FA96; Sun, 7 Mar 2021 12:27:42 -0500 (EST) Received: (nullmailer pid 1091660 invoked by uid 1000); Sun, 07 Mar 2021 17:27:38 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 13/22] lib/open: Use check for existing database by trial opening Date: Sun, 7 Mar 2021 13:27:25 -0400 Message-Id: <20210307172734.1091264-14-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210307172734.1091264-1-david@tethera.net> References: <20210307172734.1091264-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: WQTLPHMES72HI52V77VBHDVDJOYW4WAL X-Message-ID-Hash: WQTLPHMES72HI52V77VBHDVDJOYW4WAL 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615138089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ust8q4QEzUgEilE/PPB59VwqLXkX1CktJsEBPI/Dt/w=; b=fYJqnwMakwzk5CHLRbtmrizHqZuqgpjnhXDLHy9LDu0fEXcYW2dkaYChdJmhW8msxEPy2Z jqKfXXtpAm5vrbcuhWMX8nWCSBNcetSsVt3m3c1oRE3J/pKeC3lHODWoiMTRk1StgEpk0j yceMDmPWk8oeSC+ocbcNVs3fLX9xU6YSMbEMSKdxo1SfW+9GA7icg4h2fpD+i9DinecHkA pQdSsvs1G7iEN/t4cenPWBfyvKQeM8sX6hr6QOpsEQh8pJFujS0JNEZxiSA5YPKIjKKoPH gogN9yxc1ge5zAu/+SIs7+dziqiKg6HPtnzP7/vrv6bNk7fezZHL7UDe3lRFnA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615138089; a=rsa-sha256; cv=none; b=RWLDUTfyvirwxEMvNz90MOVwh0eu6UU5DBwGM4610FqPbxr4tyeLTquUMpqR+Vp6NqYbZS ADZ2RMUcNKO9gTKjdAznNQ9HBtzdXb5hqoyd+ohnDcWGAA0oxlX+Mh9feO2GScAVDVcf7b i45eo5pzrDZ0ggVn2K1zT14UaikPv+klWc8yQNVELWryD0azTwZ2onyle7+0ZV27wU7srU 07nnEWAuDTPbi+MU9tLps5ZDZ8jkTvMpcQaOfSalGNZcVqZzhKjDhrUu+ylggaD8vQ24Xq 4nMI6NwJXQ5hZSCvv/ngeUihPYqyLvravF7BXXNpLesF1uWXh6zfA9R70mlICQ== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.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-Spam-Score: -0.96 Authentication-Results: aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.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: CE17D1E989 X-Spam-Score: -0.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: gfANQOy7ekH6 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 | 60 +++++++++++++++++++++++++++++--------- test/T360-symbol-hiding.sh | 2 +- 2 files changed, 47 insertions(+), 15 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index e59cfcdc..bfeb1ce9 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -232,6 +232,50 @@ _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) @@ -408,7 +452,6 @@ 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; GKeyFile *key_file = NULL; @@ -423,27 +466,16 @@ notmuch_database_open_with_config (const char *database_path, if ((status = _choose_database_path (local, 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; - } + _set_database_path (notmuch, database_path); - status = _db_dir_exists (notmuch_path, &message); + status = _choose_xapian_path (local, database_path, ¬much->xapian_path, &message); if (status) goto DONE; - if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) { - status = NOTMUCH_STATUS_OUT_OF_MEMORY; - goto DONE; - } - status = _finish_open (notmuch, profile, mode, key_file, &message); DONE: 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.1