From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8KKsOIh4LWAUHgAA0tVLHw (envelope-from ) for ; Wed, 17 Feb 2021 20:11:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mKlrNIh4LWDzcwAAbx9fmQ (envelope-from ) for ; Wed, 17 Feb 2021 20:11:52 +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 79DB8213C4 for ; Wed, 17 Feb 2021 21:11:52 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 1D3D826B98; Wed, 17 Feb 2021 15:11:17 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id D77E426A29 for ; Wed, 17 Feb 2021 15:10:58 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id A03136067D; Wed, 17 Feb 2021 15:10:58 -0500 (EST) Received: (nullmailer pid 2021411 invoked by uid 1000); Wed, 17 Feb 2021 20:10:50 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 04/21] CLI/show: complete conversion to new configuration framework. Date: Wed, 17 Feb 2021 16:10:28 -0400 Message-Id: <20210217201045.2021106-5-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: MSXPZEPS2HWD5WIJ4B5TXPWWOBSA5OU6 X-Message-ID-Hash: MSXPZEPS2HWD5WIJ4B5TXPWWOBSA5OU6 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: 79DB8213C4 X-Spam-Score: 0.56 X-Migadu-Scanner: scn1.migadu.com X-TUID: Er/z3fIQ0l2o In order to open the database in main() for this command, we may need to re-open it in the (possibly less common) case where crypto options require it. --- notmuch-show.c | 26 +++++++------------------- notmuch.c | 2 +- test/T035-read-config.sh | 2 -- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index c3c42caa..4a26f8ce 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1215,9 +1215,8 @@ static const notmuch_show_format_t *formatters[] = { }; int -notmuch_show_command (notmuch_config_t *config, unused(notmuch_database_t *notmuch), int argc, char *argv[]) +notmuch_show_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[]) { - notmuch_database_t *notmuch; notmuch_query_t *query; char *query_string; int opt_index, ret; @@ -1234,7 +1233,7 @@ notmuch_show_command (notmuch_config_t *config, unused(notmuch_database_t *notmu bool entire_thread_set = false; bool single_message; bool unthreaded = FALSE; - char *status_string = NULL; + notmuch_status_t status; notmuch_opt_desc_t options[] = { { .opt_keyword = &format, .name = "format", .keywords = @@ -1324,25 +1323,14 @@ notmuch_show_command (notmuch_config_t *config, unused(notmuch_database_t *notmu fprintf (stderr, "Warning: --include-html only implemented for format=text, format=json and format=sexp\n"); } - notmuch_database_mode_t mode = NOTMUCH_DATABASE_MODE_READ_ONLY; - if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) - mode = NOTMUCH_DATABASE_MODE_READ_WRITE; - if (notmuch_database_open_with_config (NULL, - mode, - _notmuch_config_get_path (config), - NULL, - ¬much, - &status_string)) { - if (status_string) { - fputs (status_string, stderr); - free (status_string); + if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) { + status = notmuch_database_reopen (notmuch, NOTMUCH_DATABASE_MODE_READ_WRITE); + if (status) { + fprintf (stderr, "Error reopening database for READ_WRITE: %s\n", notmuch_status_to_string (status)); + return EXIT_FAILURE; } - - return EXIT_FAILURE; } - config = NULL; - notmuch_exit_if_unmatched_db_uuid (notmuch); query_string = query_string_from_args (notmuch, argc - opt_index, argv + opt_index); diff --git a/notmuch.c b/notmuch.c index 7360e0e6..71482e43 100644 --- a/notmuch.c +++ b/notmuch.c @@ -152,7 +152,7 @@ static command_t commands[] = { "Search for messages matching the given search terms." }, { "address", notmuch_address_command, NOTMUCH_COMMAND_DATABASE_EARLY, "Get addresses from messages matching the given search terms." }, - { "show", notmuch_show_command, NOTMUCH_COMMAND_CONFIG_OPEN, + { "show", notmuch_show_command, NOTMUCH_COMMAND_DATABASE_EARLY, "Show all messages matching the search terms." }, { "count", notmuch_count_command, NOTMUCH_COMMAND_DATABASE_EARLY, "Count messages matching the search terms." }, diff --git a/test/T035-read-config.sh b/test/T035-read-config.sh index 205d1736..ac0f420b 100755 --- a/test/T035-read-config.sh +++ b/test/T035-read-config.sh @@ -378,7 +378,6 @@ restore_database test_expect_equal "$output" "OK" test_begin_subtest "show with alternate config (xdg)" -test_subtest_known_broken backup_database notmuch tag -- +foobar17 '*' xdg_config @@ -389,7 +388,6 @@ restore_config test_expect_equal "$output" "OK" test_begin_subtest "show with alternate config (xdg+profile)" -test_subtest_known_broken backup_database notmuch tag -- +foobar17 '*' xdg_config foobar17 -- 2.30.0