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 4FXQOmzaQGBvbgAA0tVLHw (envelope-from ) for ; Thu, 04 Mar 2021 13:02:36 +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 qBjRNmzaQGC1GgAA1q6Kng (envelope-from ) for ; Thu, 04 Mar 2021 13:02:36 +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 7E1E422143 for ; Thu, 4 Mar 2021 14:02:36 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id C755227076; Thu, 4 Mar 2021 08:02:00 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 4C2131FADE for ; Thu, 4 Mar 2021 08:01:51 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 43AB65FA96; Thu, 4 Mar 2021 08:01:51 -0500 (EST) Received: (nullmailer pid 4047196 invoked by uid 1000); Thu, 04 Mar 2021 13:01:45 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 16/27] CLI/config: use notmuch_database_reopen Date: Thu, 4 Mar 2021 09:01:28 -0400 Message-Id: <20210304130139.4046183-17-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210304130139.4046183-1-david@tethera.net> References: <20210304130139.4046183-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: PV3VECKGPJKN6EIWQCDV6G3RI7RFN5KJ X-Message-ID-Hash: PV3VECKGPJKN6EIWQCDV6G3RI7RFN5KJ 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=1614862956; 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=JXzGBfdHFX1NeaD0m/zCmP8HQijTNNKG5gIadHDqQ/o=; b=N+y0NGvgkWFKS8p5oxTyx0J8J3iyhKkfgbALGkNGb3n+6AZtaBlR45JZKvbXP3Ptlj8vCM YpS8b3fenysy6oe3CQprYwyXesBGbou+1xUVmgq2Qwg4q2k3mR3J8ozhyxRzRxwermfYAI 2VTBasHuDX1kKuQZ5koZVQ7WpfkFJc4FPPfeNteys8JjgNwixFRgbbXv785IckTxz1r1PW oNruzax7ptUKvyLnKVd/wsCOdXCXO6Kvb8KtC45CE/a+jwdycaWEKqhsNypgVJGWGs6ClO K2AD3Pq4x6L91i0uVxSMV0lJAve0lgR0k94/I10yYSSiBfNUByhaDcUwOF8JYQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614862956; a=rsa-sha256; cv=none; b=bkIeGzcmwLSYiQRiXcq36rFOFQFdktpIlNZ+RQhEDyQa71ZYGm0D0nAFDZNehkn4jMdFYm w8uJL1pXFpKnQuNz84uIjESkhr9ilDEmJ1N9t8jn7yF7ek9NrV/276Pvozgfzd6fXDffwN cwkGn9WyZoDS2ruOW40/sUE00oZMov70xPdDZDqs+x4uMkjCWOOPMbTCXJAICt9QNPl+wq 0Z4ZimtZgmsit+OIgcc/fNtktTQOSb4gt80reEmAFgFVL7Wzmx4ytAcvrfSV/3Ir05tVna Izyr/GIrv8Cf/wkxEheXVxyJuQ8zVGWl7C1apzEgn94+SqGSfK0Yrzz7RjAPEQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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: -0.88 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: 7E1E422143 X-Spam-Score: -0.88 X-Migadu-Scanner: scn1.migadu.com X-TUID: Ehk0bo8X3mMQ This allows `notmuch config` to use the common configuration information carried by the notmuch_database_t opened at the top level. --- notmuch-config.c | 16 +++++++--------- test/T750-user-header.sh | 3 ++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/notmuch-config.c b/notmuch-config.c index a46c639e..2ad3f52e 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -693,9 +693,8 @@ notmuch_config_command_get (notmuch_database_t *notmuch, char *item) } static int -_set_db_config (notmuch_config_t *config, const char *key, int argc, char **argv) +_set_db_config (notmuch_database_t *notmuch, const char *key, int argc, char **argv) { - notmuch_database_t *notmuch; const char *val = ""; if (argc > 1) { @@ -708,12 +707,11 @@ _set_db_config (notmuch_config_t *config, const char *key, int argc, char **argv val = argv[0]; } - if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) + if (print_status_database ("notmuch config", notmuch, + notmuch_database_reopen (notmuch, + NOTMUCH_DATABASE_MODE_READ_WRITE))) return EXIT_FAILURE; - /* XXX Handle UUID mismatch? */ - if (print_status_database ("notmuch config", notmuch, notmuch_database_set_config (notmuch, key, val))) return EXIT_FAILURE; @@ -726,7 +724,7 @@ _set_db_config (notmuch_config_t *config, const char *key, int argc, char **argv } static int -notmuch_config_command_set (notmuch_config_t *config, char *item, int argc, char *argv[]) +notmuch_config_command_set (notmuch_config_t *config, notmuch_database_t *notmuch, char *item, int argc, char *argv[]) { char *group, *key; config_key_info_t *key_info; @@ -741,7 +739,7 @@ notmuch_config_command_set (notmuch_config_t *config, char *item, int argc, char return 1; if (key_info && key_info->in_db) { - return _set_db_config (config, item, argc, argv); + return _set_db_config (notmuch, item, argc, argv); } if (_item_split (item, &group, &key)) @@ -838,7 +836,7 @@ notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch, i "one argument.\n"); return EXIT_FAILURE; } - ret = notmuch_config_command_set (config, argv[1], argc - 2, argv + 2); + ret = notmuch_config_command_set (config, notmuch, argv[1], argc - 2, argv + 2); } else if (strcmp (argv[0], "list") == 0) { ret = notmuch_config_command_list (notmuch); } else { diff --git a/test/T750-user-header.sh b/test/T750-user-header.sh index b19db571..586788b3 100755 --- a/test/T750-user-header.sh +++ b/test/T750-user-header.sh @@ -5,7 +5,8 @@ test_description='indexing user specified headers' test_begin_subtest "error adding user header before initializing DB" notmuch config set index.header.List List-Id 2>&1 | notmuch_dir_sanitize > OUTPUT cat < EXPECTED -Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory. +notmuch config: Illegal argument for function +Cannot reopen closed or nonexistent database EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.1