From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 11/22] lib/open: factor out the second half of n_d_open_with_config
Date: Thu, 4 Mar 2021 09:31:14 -0400 [thread overview]
Message-ID: <20210304133125.4050229-12-david@tethera.net> (raw)
In-Reply-To: <20210304133125.4050229-1-david@tethera.net>
The idea is to allow reuse in n_d_create_with_config. This is
primarily code movement, with some changes in error messages to reduce
the number of input parameters.
---
lib/open.cc | 115 +++++++++++++++++++++++++++++++---------------------
1 file changed, 68 insertions(+), 47 deletions(-)
diff --git a/lib/open.cc b/lib/open.cc
index 6a5c99dd..d052f95d 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -249,54 +249,18 @@ static void _init_libs () {
}
}
-notmuch_status_t
-notmuch_database_open_with_config (const char *database_path,
- notmuch_database_mode_t mode,
- const char *config_path,
- const char *profile,
- notmuch_database_t **database,
- char **status_string)
+static notmuch_status_t
+_finish_open (notmuch_database_t *notmuch,
+ const char *profile,
+ notmuch_database_mode_t mode,
+ GKeyFile *key_file,
+ char **message_ptr)
{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
- void *local = talloc_new (NULL);
- notmuch_database_t *notmuch = NULL;
- char *notmuch_path, *incompat_features;
+ char *incompat_features;
char *message = NULL;
unsigned int version;
- GKeyFile *key_file = NULL;
-
- _init_libs ();
-
- notmuch = _alloc_notmuch ();
- if (!notmuch) {
- status = NOTMUCH_STATUS_OUT_OF_MEMORY;
- goto DONE;
- }
-
- if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
- goto DONE;
-
- _set_database_path (notmuch, database_path);
-
- status = _db_dir_exists (database_path, &message);
- if (status)
- goto DONE;
-
- if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
- message = strdup ("Out of memory\n");
- status = NOTMUCH_STATUS_OUT_OF_MEMORY;
- goto DONE;
- }
-
- status = _db_dir_exists (notmuch_path, &message);
- if (status)
- goto DONE;
-
- if (! (notmuch->xapian_path = talloc_asprintf (local, "%s/%s", notmuch_path, "xapian"))) {
- message = strdup ("Out of memory\n");
- status = NOTMUCH_STATUS_OUT_OF_MEMORY;
- goto DONE;
- }
+ const char *database_path = notmuch_database_get_path (notmuch);
try {
std::string last_thread_id;
@@ -319,7 +283,7 @@ notmuch_database_open_with_config (const char *database_path,
"Error: Notmuch database at %s\n"
" has a newer database format version (%u) than supported by this\n"
" version of notmuch (%u).\n",
- notmuch_path, version, NOTMUCH_DATABASE_VERSION));
+ database_path, version, NOTMUCH_DATABASE_VERSION));
notmuch_database_destroy (notmuch);
notmuch = NULL;
status = NOTMUCH_STATUS_FILE_ERROR;
@@ -329,7 +293,7 @@ notmuch_database_open_with_config (const char *database_path,
/* Check features. */
incompat_features = NULL;
notmuch->features = _notmuch_database_parse_features (
- local, notmuch->xapian_db->get_metadata ("features").c_str (),
+ notmuch, notmuch->xapian_db->get_metadata ("features").c_str (),
version, mode == NOTMUCH_DATABASE_MODE_READ_WRITE ? 'w' : 'r',
&incompat_features);
if (incompat_features) {
@@ -337,7 +301,7 @@ notmuch_database_open_with_config (const char *database_path,
"Error: Notmuch database at %s\n"
" requires features (%s)\n"
" not supported by this version of notmuch.\n",
- notmuch_path, incompat_features));
+ database_path, incompat_features));
notmuch_database_destroy (notmuch);
notmuch = NULL;
status = NOTMUCH_STATUS_FILE_ERROR;
@@ -415,6 +379,63 @@ notmuch_database_open_with_config (const char *database_path,
notmuch = NULL;
status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
+ DONE:
+ if (message_ptr)
+ *message_ptr = message;
+ return status;
+}
+
+notmuch_status_t
+notmuch_database_open_with_config (const char *database_path,
+ notmuch_database_mode_t mode,
+ const char *config_path,
+ const char *profile,
+ notmuch_database_t **database,
+ char **status_string)
+{
+ notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
+ void *local = talloc_new (NULL);
+ notmuch_database_t *notmuch = NULL;
+ char *notmuch_path;
+ char *message = NULL;
+ struct stat st;
+ int err;
+ GKeyFile *key_file = NULL;
+
+ _init_libs ();
+
+ notmuch = _alloc_notmuch ();
+ if (!notmuch) {
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
+ if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
+ goto DONE;
+
+ _set_database_path (notmuch, database_path);
+
+ status = _db_dir_exists (database_path, &message);
+ if (status)
+ goto DONE;
+
+ if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
+ message = strdup ("Out of memory\n");
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
+ status = _db_dir_exists (notmuch_path, &message);
+ if (status)
+ goto DONE;
+
+ if (! (notmuch->xapian_path = talloc_asprintf (local, "%s/%s", notmuch_path, "xapian"))) {
+ message = strdup ("Out of memory\n");
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
+ status = _finish_open (notmuch, profile, mode, key_file, &message);
DONE:
talloc_free (local);
--
2.30.1
next prev parent reply other threads:[~2021-03-04 13:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 13:31 v2 support flexible database location David Bremner
2021-03-04 13:31 ` [PATCH 01/22] test/setup: add check for config exists, but no database David Bremner
2021-03-04 13:31 ` [PATCH 02/22] lib: publish API for notmuch_database_reopen David Bremner
2021-03-04 13:31 ` [PATCH 03/22] lib: save path of xapian database in notmuch struct David Bremner
2021-03-04 13:31 ` [PATCH 04/22] lib: support reopening databases for write access David Bremner
2021-03-04 13:31 ` [PATCH 05/22] CLI/show: complete conversion to new configuration framework David Bremner
2021-03-04 13:31 ` [PATCH 06/22] lib/open: support NOTMUCH_DATABASE environment variable David Bremner
2021-03-04 13:31 ` [PATCH 07/22] lib/open: allocate notmuch_t struct early David Bremner
2021-03-04 13:31 ` [PATCH 08/22] lib: remove "path" from notmuch struct David Bremner
2021-03-04 13:31 ` [PATCH 09/22] lib/open: factor out library initialization David Bremner
2021-03-04 13:31 ` [PATCH 10/22] lib/open: reuse directory checks from n_d_c_with_config David Bremner
2021-03-04 13:31 ` David Bremner [this message]
2021-03-04 13:31 ` [PATCH 12/22] lib/open: use _finish_open in n_d_create_with_config David Bremner
2021-03-04 13:31 ` [PATCH 13/22] lib/open: Use check for existing database by trial opening David Bremner
2021-03-04 13:31 ` [PATCH 14/22] support splitting mail from database location David Bremner
2021-03-04 13:31 ` [PATCH 15/22] lib/open: check for split configuration when creating database David Bremner
2021-03-04 13:31 ` [PATCH 16/22] CLI/new: support split database and mail location David Bremner
2021-03-04 13:31 ` [PATCH 17/22] lib/open: support XDG_DATA_HOME as a fallback database location David Bremner
2021-03-04 13:31 ` [PATCH 18/22] CLI/insert: support split database and mail root David Bremner
2021-03-04 13:31 ` [PATCH 19/22] lib/compact: enable split config David Bremner
2021-03-04 13:31 ` [PATCH 20/22] lib/open: fix hook directory calculation in split configuration David Bremner
2021-03-04 13:31 ` [PATCH 21/22] lib/config: add configuration variable for backup directory David Bremner
2021-03-04 13:31 ` [PATCH 22/22] CLI/new: use " David Bremner
-- strict thread matches above, loose matches on Subject: below --
2021-03-07 17:27 v3 support flexible database location David Bremner
2021-03-07 17:27 ` [PATCH 11/22] lib/open: factor out the second half of n_d_open_with_config David Bremner
2021-03-14 14:01 v4 flexible path location David Bremner
2021-03-14 14:02 ` [PATCH 11/22] lib/open: factor out the second half of n_d_open_with_config David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210304133125.4050229-12-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).