Persisting this status will allow us to use the information in other
compilation units, in particular when setting configuration defaults.
---
lib/database-private.h | 7 ++++++-
lib/open.cc | 19 ++++++++-----------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/lib/database-private.h b/lib/database-private.h
index 8133e364..5db8882f 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -191,12 +191,17 @@ operator& (notmuch_field_flag_t a, notmuch_field_flag_t b)
Xapian::QueryParser::FLAG_PURE_NOT)
/*
- * Which parameters were explicit when the database was opened */
+ * explicit and implied parameters to open */
typedef enum {
NOTMUCH_PARAM_NONE = 0,
+ /* database passed explicitely */
NOTMUCH_PARAM_DATABASE = 1 << 0,
+ /* config file passed explicitely */
NOTMUCH_PARAM_CONFIG = 1 << 1,
+ /* profile name passed explicitely */
NOTMUCH_PARAM_PROFILE = 1 << 2,
+ /* split (e.g. XDG) configuration */
+ NOTMUCH_PARAM_SPLIT = 1 << 3,
} notmuch_open_param_t;
/*
diff --git a/lib/open.cc b/lib/open.cc
index 320b690e..bf1d7ae3 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -190,7 +190,6 @@ _choose_database_path (notmuch_database_t *notmuch,
const char *profile,
GKeyFile *key_file,
const char **database_path,
- bool *split,
char **message)
{
if (! *database_path) {
@@ -215,7 +214,7 @@ _choose_database_path (notmuch_database_t *notmuch,
if (status) {
*database_path = NULL;
} else {
- *split = true;
+ notmuch->params |= NOTMUCH_PARAM_SPLIT;
}
}
@@ -513,7 +512,6 @@ notmuch_database_open_with_config (const char
*database_path,
notmuch_database_t *notmuch = NULL;
char *message = NULL;
GKeyFile *key_file = NULL;
- bool split = false;
_notmuch_init ();
@@ -530,7 +528,7 @@ notmuch_database_open_with_config (const char
*database_path,
}
if ((status = _choose_database_path (notmuch, profile, key_file,
- &database_path, &split,
+ &database_path,
&message)))
goto DONE;
@@ -610,7 +608,6 @@ notmuch_database_create_with_config (const char
*database_path,
char *message = NULL;
GKeyFile *key_file = NULL;
int err;
- bool split = false;
_notmuch_init ();
@@ -627,7 +624,7 @@ notmuch_database_create_with_config (const char
*database_path,
}
if ((status = _choose_database_path (notmuch, profile, key_file,
- &database_path, &split, &message)))
+ &database_path, &message)))
goto DONE;
status = _db_dir_exists (database_path, &message);
@@ -636,18 +633,19 @@ notmuch_database_create_with_config (const char
*database_path,
_set_database_path (notmuch, database_path);
- if (key_file && ! split) {
+ if (key_file && ! (notmuch->params & NOTMUCH_PARAM_SPLIT)) {
char *mail_root = notmuch_canonicalize_file_name (
g_key_file_get_string (key_file, "database", "mail_root", NULL));
char *db_path = notmuch_canonicalize_file_name (database_path);
- split = (mail_root && (0 != strcmp (mail_root, db_path)));
+ if (mail_root && (0 != strcmp (mail_root, db_path)))
+ notmuch->params |= NOTMUCH_PARAM_SPLIT;
free (mail_root);
free (db_path);
}
- if (split) {
+ if (notmuch->params & NOTMUCH_PARAM_SPLIT) {
notmuch_path = database_path;
} else {
if (! (notmuch_path = talloc_asprintf (notmuch, "%s/%s", database_path,
".notmuch"))) {
@@ -809,7 +807,6 @@ notmuch_database_load_config (const char *database_path,
notmuch_database_t *notmuch = NULL;
char *message = NULL;
GKeyFile *key_file = NULL;
- bool split = false;
_notmuch_init ();
@@ -832,7 +829,7 @@ notmuch_database_load_config (const char *database_path,
}
status = _choose_database_path (notmuch, profile, key_file,
- &database_path, &split, &message);
+ &database_path, &message);
switch (status) {
case NOTMUCH_STATUS_NO_DATABASE:
case NOTMUCH_STATUS_SUCCESS:
--
2.34.1
_______________________________________________
notmuch mailing list -- [email protected]
To unsubscribe send an email to [email protected]
