From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cKAUJrIRbWCFHwEAgWs5BA (envelope-from ) for ; Wed, 07 Apr 2021 03:58:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id cMjeH7IRbWC9SAAAbx9fmQ (envelope-from ) for ; Wed, 07 Apr 2021 01:58:10 +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 aspmx1.migadu.com (Postfix) with ESMTPS id 162F4AEB4 for ; Wed, 7 Apr 2021 03:58:10 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 161E727567; Tue, 6 Apr 2021 21:56:51 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id F07A829052 for ; Tue, 6 Apr 2021 21:56:03 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id E74125FA96; Tue, 6 Apr 2021 21:56:03 -0400 (EDT) Received: (nullmailer pid 2964228 invoked by uid 1000); Wed, 07 Apr 2021 01:55:35 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 11/28] CLI: load merged config at top level Date: Tue, 6 Apr 2021 22:55:13 -0300 Message-Id: <20210407015530.2964017-12-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210407015530.2964017-1-david@tethera.net> References: <20210407015530.2964017-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: WNEPH4IZCTSJAVE3J6AJQAY527ALGP7E X-Message-ID-Hash: WNEPH4IZCTSJAVE3J6AJQAY527ALGP7E 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=1617760690; 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=V9nh7n3Jn9zX5CYZSwkJYNMCV9yQ3/mgs2zcfyhn2RU=; b=YSW/7i5Hp7aO2Is0vlRblSoE4NMG+wfuYJK6GkJMTqMQIx7Iwg6afw17eI2fAT8H+KmiRv YyPxdiLH4fv7jKvx+Gsg/+vG5o+5EnueWC9b7X/Mk0oNX7zPXsOsUKZWnMsRK4eGmTrrHa PMMGYn7cEgH7uUTcAeuhxURqB7qPg96yRcPpTbltHQ2s++8DiIVsEm+0ZWIMKbBDnsM74E 4DSmg5xdWHSdd+SDyLOiEeyrjFozQYh4VKcaBt60j8HI9BlMRYTFIbpYZ/1JxzkzPiWTVM vZIlO37TQ9tE40MIJ9RdJUIOifLbm2s2k4+rjUw/oDQIzuoUtcAPOz1Subgszw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617760690; a=rsa-sha256; cv=none; b=FAAO0CG3qAT0yxfxn5rMH0cKY4TLn3P4+fGI1uUgvhUVaK4VA72PUphSPEwUqFy2i9cbeI QKh48ZZaDOsTJ8vKsgdT0eTMWP3gD4fUY1wwm5AqPG1AzVHit1D+Ul41a5gpjqvbuakvyR CIpCNJO41VuDPFCnPXTGcpOBNozDkQD9T4uH+mIwvGoYAU2jPKE/wuT3JQi+vFYSHUtD3J b0rXI5J+QkWXSaoWPXK/hdF+/mNjQji5fKWHqyAJ/qIZw9Q7qUg/DiNkhUoYpJwSrKAdzV ldDylLycwNpRxMoGgZJJawLIsyoVotUy4WUY2tyqybDxq0uibB91vAqFzqagDg== ARC-Authentication-Results: i=1; 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-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 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 162F4AEB4 X-Spam-Score: -0.88 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6JBWNkZT/L4J This paves the way for the conversion of the remaining subcommands to the new configuration framework. --- notmuch-client.h | 1 + notmuch.c | 29 ++++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index 70458629..b560e3ed 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -272,6 +272,7 @@ typedef enum { NOTMUCH_COMMAND_DATABASE_EARLY = 1 << 2, NOTMUCH_COMMAND_DATABASE_WRITE = 1 << 3, NOTMUCH_COMMAND_DATABASE_CREATE = 1 << 4, + NOTMUCH_COMMAND_CONFIG_LOAD = 1 << 5, } notmuch_command_mode_t; notmuch_config_t * diff --git a/notmuch.c b/notmuch.c index f2bf9c24..742544c2 100644 --- a/notmuch.c +++ b/notmuch.c @@ -175,7 +175,7 @@ static command_t commands[] = { { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Re-index all messages matching the search terms." }, - { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN, + { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_LOAD, "Get or set settings in the notmuch configuration file." }, #if WITH_EMACS { "emacs-mua", NULL, 0, @@ -471,7 +471,7 @@ main (int argc, char *argv[]) notmuch_config_t *config = NULL; notmuch_database_t *notmuch = NULL; int opt_index; - int ret; + int ret = EXIT_SUCCESS; notmuch_opt_desc_t options[] = { { .opt_string = &config_file_name, .name = "config" }, @@ -559,7 +559,30 @@ main (int argc, char *argv[]) return EXIT_FAILURE; } } - } else { + } + + if (command->mode & NOTMUCH_COMMAND_CONFIG_LOAD) { + char *status_string = NULL; + notmuch_status_t status; + status = notmuch_database_load_config (NULL, + config_file_name, + NULL, + ¬much, + &status_string); + if (status) { + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } + + if (status == NOTMUCH_STATUS_NO_CONFIG) + fputs ("Try running 'notmuch setup' to create a configuration.", stderr); + goto DONE; + } + + } + + if (command->mode & NOTMUCH_COMMAND_CONFIG_OPEN) { config = notmuch_config_open (local, config_file_name, command->mode); if (! config) { ret = EXIT_FAILURE; -- 2.30.2