From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mCVTEj4NRWAiUwAA0tVLHw (envelope-from ) for ; Sun, 07 Mar 2021 17:28:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id QN4eDj4NRWBKVQAA1q6Kng (envelope-from ) for ; Sun, 07 Mar 2021 17:28:30 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 aspmx1.migadu.com (Postfix) with ESMTPS id C26F6149AC for ; Sun, 7 Mar 2021 18:28:29 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id C482C27D50; Sun, 7 Mar 2021 12:28:02 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id D215627575 for ; Sun, 7 Mar 2021 12:27:46 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id CA9855FA96; Sun, 7 Mar 2021 12:27:46 -0500 (EST) Received: (nullmailer pid 1091643 invoked by uid 1000); Sun, 07 Mar 2021 17:27:38 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 06/22] lib/open: support NOTMUCH_DATABASE environment variable Date: Sun, 7 Mar 2021 13:27:18 -0400 Message-Id: <20210307172734.1091264-7-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: FWVJDGTXMH6KRWDRTXXWKY55NMHXMM7H X-Message-ID-Hash: FWVJDGTXMH6KRWDRTXXWKY55NMHXMM7H 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=1615138109; 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=8T2px641j8NezmkrKI6Evt1VL8ruASc4QR9zD6rmHh0=; b=iEzJK/86WJPvbRXnv41OlJSFP5jsNLHywndKNhJvY07/jzEx3oIrVLOwQyXnLal/dNc3sQ AMJErhc/30xpRICLHTVKQPkzieOWCmqcDABQAEp988eGjSZ+hyZ79Ln2z3mhFRw9eoaOXg 7PMwcovagRX9Df8VhCaDDInnCa5DMVqlCCsHBh8x86FRUUIGd7ld8M4LLdT68+iyNM4YsH SrqN8RosHHq612Wkst8S3ZIg2H3EboYUeLgLMU9+T1cOIHP/85v6x1qO6nLRQaTSa12yha Q9zbnwZJlPG33YYi2867SbrsggAUZLng0e4qRKlqar7HLToH65SNwHNnRJZs6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615138109; a=rsa-sha256; cv=none; b=JCUdS5ifnKp26KXDaVU9bWYCTyFHL9fEWSm31dIFyak+qwEnCoWxy5YS4eynzLVmZs6SVI eIdN8zhJlcvTdpixTCAgI/MJCTzxB10pMGgAsbHVG4WZ6qHozK/p2EDTCPT69XCeE+6IRd 8YH+cx6ykgbd8NO0ZG7V+m2AllrR0V8rzsAWVFzEl3sIr64YxINXg9TVNTqMXMugkYcd6L ehwkC3feTzd56V47vULdVTEU+lK4wvrKFNMdh0TFyK2fkCsiqRTRua0E+UoeWMfxAYus2S ZSK5jkzcOzxeLn4xFgeA4Cl7+I8t5zjs/RUvBvCIMeBlkECTFDaNvHn912Itzg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.08 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: C26F6149AC X-Spam-Score: -1.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: dcwVHRax7vaU The additional code is trivial, but making sure we get the priority of various options correct takes a few tests. --- lib/open.cc | 4 +++ test/T590-libconfig.sh | 67 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/lib/open.cc b/lib/open.cc index 4d01117d..e1732d35 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -168,6 +168,10 @@ _choose_database_path (void *ctx, return status; } + if (! *database_path) { + *database_path = getenv ("NOTMUCH_DATABASE"); + } + if (! *database_path && *key_file) { char *path = g_key_file_get_value (*key_file, "database", "path", NULL); if (path) { diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index e7e6e08a..4e510e97 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -27,7 +27,7 @@ int main (int argc, char** argv) &db, &msg); if (stat != NOTMUCH_STATUS_SUCCESS) { - fprintf (stderr, "error opening database: %d %s\n", stat, msg ? msg : ""); + fprintf (stderr, "error opening database\n%s\n%s\n", notmuch_status_to_string (stat), msg ? msg : ""); exit (1); } EOF @@ -505,4 +505,69 @@ EOF test_expect_equal_file EXPECTED OUTPUT restore_database +test_begin_subtest "no config, fail to open database" +old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG} +unset NOTMUCH_CONFIG +cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL% +{ + printf("NOT RUN"); +} +EOF +NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +cat <<'EOF' >EXPECTED +== stdout == +== stderr == +error opening database +Erroneous NULL pointer +Error: Cannot open a database for a NULL path. + +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "open database from NOTMUCH_DATABASE" +old_NOTMUCH_CONFIG=${NOTMUCH_CONFIG} +unset NOTMUCH_CONFIG +export NOTMUCH_DATABASE=${MAIL_DIR} +cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL% +{ + EXPECT0(notmuch_database_get_config (db, "test.key1", &val)); + printf("test.key1 = %s\n", val); + EXPECT0(notmuch_database_get_config (db, "test.key2", &val)); + printf("test.key2 = %s\n", val); +} +EOF +NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +unset NOTMUCH_DATABASE +cat <<'EOF' >EXPECTED +== stdout == +test.key1 = testvalue1 +test.key2 = testvalue2 +== stderr == +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "NOTMUCH_DATABASE overrides config" +old_path=$(notmuch config get database.path) +notmuch config set database.path /nonexistent +export NOTMUCH_DATABASE=${MAIL_DIR} +cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL% +{ + EXPECT0(notmuch_database_get_config (db, "test.key1", &val)); + printf("test.key1 = %s\n", val); + EXPECT0(notmuch_database_get_config (db, "test.key2", &val)); + printf("test.key2 = %s\n", val); +} +EOF +NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +unset NOTMUCH_DATABASE +cat <<'EOF' >EXPECTED +== stdout == +test.key1 = testvalue1 +test.key2 = testvalue2 +== stderr == +EOF +notmuch config set database.path "${old_path}" +test_expect_equal_file EXPECTED OUTPUT + + test_done -- 2.30.1