From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UGeYBVjaQGDqagAA0tVLHw (envelope-from ) for ; Thu, 04 Mar 2021 13:02:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aFBLAVjaQGCxQQAAB5/wlQ (envelope-from ) for ; Thu, 04 Mar 2021 13:02:16 +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 3DD2715F4D for ; Thu, 4 Mar 2021 14:02:14 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id D488326AD8; Thu, 4 Mar 2021 08:01:54 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id A58D61FADE for ; Thu, 4 Mar 2021 08:01:48 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 720EE5FAA5; Thu, 4 Mar 2021 08:01:48 -0500 (EST) Received: (nullmailer pid 4047214 invoked by uid 1000); Thu, 04 Mar 2021 13:01:45 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 25/27] CLI/config: remove calls to notmuch_config_open from top level Date: Thu, 4 Mar 2021 09:01:37 -0400 Message-Id: <20210304130139.4046183-26-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: MTRVYETCQOY5Q2UYEB2WSGERA26P2FZY X-Message-ID-Hash: MTRVYETCQOY5Q2UYEB2WSGERA26P2FZY 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=1614862935; 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=aSqKT29MJHXmHQR9gVDXHi3QtFQHFd2S4xRWpvcpyck=; b=GUrwS4cSImyyuG1YSCfJ0gsI2+ksjiTvMuyReOZxuPwnMURMGdsIDlDZrkCjnt91vyDiO1 4eG/p/zCCdr/KHwWi2WTbRnqxhzdOrKjH6jbYGxE88uJ1ZBOqNyjTpSX6PGKxS2nCD2Zyy qCU+QttPpq2gVy84MKSSS6uogorpqomuROltuNhbC3jspKtUDE8j4H9zNa6LKyKk5rv8Tm pp7Qze2QzK+KOOHElNsHKeNJ/IDy1X+q8N1o7xHcATm9vjzqUDj/1hSaPN1J6LSSQd+0XS IFppEECiKd51nTsw/1xkTjYQBmAYTLNaU9q6HDQ0imtCtK0wjDR63rw3piSjAw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614862935; a=rsa-sha256; cv=none; b=Xnbz6GPKmo8I4V0DVg8EoNsSlIcjT/UX0okqgWtITU1fmxhTKc18BLPy4lJJ9nnQ28V3xI /upSpqivPB8dy99ZdJJmqzxn0dG0lr2TxCUjybe1Vg5hdvVcb4QhoFfdqD00eracMftp7M 1usiD/b7B/sxS/PTht1GSb1+OIM3uM1t5YvPbm4jTMQlv8gU7IzGl6FU0be0dJPm+cPDcA v46AlkxSLWYvXfTA5oR1FPu9tzWOfgROmILBqO3gG98vrNzUK2L365yw1JHFXw/G/lZzwG pKqjq+XsNlE81sUOAvK++5KkAr/GA6fhG7JsyWtuFxvvHrZXItHLc1OiAjRI9g== 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.80 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: 3DD2715F4D X-Spam-Score: -0.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: V4/6vkKYg1eM This will allow simplifying the subcommand interface. It also fixes a previously broken test, since notmuch_config_open does not understand the notion of the empty string as a config file name. --- notmuch-client.h | 3 +-- notmuch-config.c | 24 +++++++++++++++--------- notmuch-setup.c | 11 ++++++++++- notmuch.c | 40 ++++++++++++++++++---------------------- test/T055-path-config.sh | 1 - 5 files changed, 44 insertions(+), 35 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index 677f2f39..29b78835 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -253,7 +253,6 @@ json_quote_str (const void *ctx, const char *str); /* notmuch-config.c */ typedef enum { - NOTMUCH_COMMAND_CONFIG_OPEN = 1 << 0, NOTMUCH_COMMAND_CONFIG_CREATE = 1 << 1, NOTMUCH_COMMAND_DATABASE_EARLY = 1 << 2, NOTMUCH_COMMAND_DATABASE_WRITE = 1 << 3, @@ -264,7 +263,7 @@ typedef enum { notmuch_config_t * notmuch_config_open (notmuch_database_t *notmuch, const char *filename, - notmuch_command_mode_t config_mode); + bool create); void notmuch_config_close (notmuch_config_t *config); diff --git a/notmuch-config.c b/notmuch-config.c index 5ba62819..89813aea 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -248,7 +248,7 @@ get_config_from_file (notmuch_config_t *config, bool create_new) notmuch_config_t * notmuch_config_open (notmuch_database_t *notmuch, const char *filename, - notmuch_command_mode_t config_mode) + bool create) { char *notmuch_config_env = NULL; @@ -272,13 +272,9 @@ notmuch_config_open (notmuch_database_t *notmuch, config->key_file = g_key_file_new (); - if (config_mode & NOTMUCH_COMMAND_CONFIG_OPEN) { - bool create_new = (config_mode & NOTMUCH_COMMAND_CONFIG_CREATE) != 0; - - if (! get_config_from_file (config, create_new)) { + if (! get_config_from_file (config, create)) { talloc_free (config); return NULL; - } } if (config->is_new) @@ -581,13 +577,14 @@ _set_db_config (notmuch_database_t *notmuch, const char *key, int argc, char **a } static int -notmuch_config_command_set (notmuch_config_t *config, notmuch_database_t *notmuch, +notmuch_config_command_set (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[]) { char *group, *key; config_key_info_t *key_info; + notmuch_config_t *config; bool update_database = false; - int opt_index; + int opt_index, ret; char *item; notmuch_opt_desc_t options[] = { @@ -628,6 +625,11 @@ notmuch_config_command_set (notmuch_config_t *config, notmuch_database_t *notmuc if (_item_split (item, &group, &key)) return 1; + config = notmuch_config_open (notmuch, + notmuch_config_path (notmuch), false); + if (! config) + return 1; + /* With only the name of an item, we clear it from the * configuration file. * @@ -648,7 +650,11 @@ notmuch_config_command_set (notmuch_config_t *config, notmuch_database_t *notmuc break; } - return notmuch_config_save (config); + ret = notmuch_config_save (config); + + notmuch_config_close (config); + + return ret; } static diff --git a/notmuch-setup.c b/notmuch-setup.c index 1e22412b..c7c3ed47 100644 --- a/notmuch-setup.c +++ b/notmuch-setup.c @@ -124,7 +124,7 @@ parse_tag_list (void *ctx, char *response) } int -notmuch_setup_command (notmuch_config_t *config, +notmuch_setup_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[]) { @@ -132,6 +132,7 @@ notmuch_setup_command (notmuch_config_t *config, size_t response_size = 0; GPtrArray *other_emails; notmuch_config_values_t *new_tags, *search_exclude_tags, *emails; + notmuch_config_t *config; #define prompt(format, ...) \ do { \ @@ -151,6 +152,11 @@ notmuch_setup_command (notmuch_config_t *config, fprintf (stderr, "Warning: ignoring --uuid=%s\n", notmuch_requested_db_uuid); + config = notmuch_config_open (notmuch, + notmuch_config_path (notmuch), true); + if (! config) + return EXIT_FAILURE; + if (notmuch_config_is_new (config)) welcome_message_pre_setup (); @@ -232,6 +238,9 @@ notmuch_setup_command (notmuch_config_t *config, if (notmuch_config_save (config)) return EXIT_FAILURE; + if (config) + notmuch_config_close (config); + if (notmuch_config_is_new (config)) welcome_message_post_setup (); diff --git a/notmuch.c b/notmuch.c index b1dac8a7..1ef8f078 100644 --- a/notmuch.c +++ b/notmuch.c @@ -139,11 +139,9 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch) static command_t commands[] = { - { NULL, notmuch_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_CREATE - | NOTMUCH_COMMAND_CONFIG_LOAD, + { NULL, notmuch_command, NOTMUCH_COMMAND_CONFIG_CREATE | NOTMUCH_COMMAND_CONFIG_LOAD, "Notmuch main command." }, - { "setup", notmuch_setup_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_CREATE - | NOTMUCH_COMMAND_CONFIG_LOAD, + { "setup", notmuch_setup_command, NOTMUCH_COMMAND_CONFIG_CREATE | NOTMUCH_COMMAND_CONFIG_LOAD, "Interactively set up notmuch for first use." }, { "new", notmuch_new_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE | NOTMUCH_COMMAND_DATABASE_CREATE, @@ -170,7 +168,7 @@ static command_t commands[] = { "Compact the notmuch database." }, { "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 | NOTMUCH_COMMAND_CONFIG_LOAD, + { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_LOAD, "Get or set settings in the notmuch configuration file." }, #if WITH_EMACS { "emacs-mua", NULL, 0, @@ -365,15 +363,26 @@ notmuch_help_command (unused (notmuch_config_t *config), unused(notmuch_database * to be more clever about this in the future. */ static int -notmuch_command (notmuch_config_t *config, +notmuch_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, unused(int argc), unused(char **argv)) { - /* If the user has never configured notmuch, then run + + const char *config_path; + + /* If the user has not created a configuration file, then run * notmuch_setup_command which will give a nice welcome message, * and interactively guide the user through the configuration. */ - if (notmuch_config_is_new (config)) - return notmuch_setup_command (config, notmuch, 0, NULL); + config_path = notmuch_config_path (notmuch); + if (access (config_path, R_OK | W_OK | F_OK) == -1) { + if (errno != ENOENT) { + fprintf (stderr, "Error: %s config file access failed: %s\n", config_path, + strerror (errno)); + return EXIT_FAILURE; + } else { + return notmuch_setup_command (NULL, notmuch, 0, NULL); + } + } printf ("Notmuch is configured and appears to have a database. Excellent!\n\n" "At this point you can start exploring the functionality of notmuch by\n" @@ -564,22 +573,9 @@ main (int argc, char *argv[]) } } - if (command->mode & NOTMUCH_COMMAND_CONFIG_OPEN) { - if (! config_file_name) - config_file_name = notmuch_config_path (notmuch); - - config = notmuch_config_open (notmuch, config_file_name, command->mode); - if (! config) { - ret = EXIT_FAILURE; - goto DONE; - } - } ret = (command->function)(config, notmuch, argc - opt_index, argv + opt_index); DONE: - if (config) - notmuch_config_close (config); - talloc_report = getenv ("NOTMUCH_TALLOC_REPORT"); if (talloc_report && strcmp (talloc_report, "") != 0) { /* this relies on the previous call to diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index 535c41e9..2045a555 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -258,7 +258,6 @@ EOF case $config in XDG*) test_begin_subtest "Set shadowed config value in database ($config)" - test_subtest_known_broken name=${RANDOM} value=${RANDOM} key=test${test_count}.${name} -- 2.30.1