debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/open: factor out choosing database path

Browse source 
The plan is to share code with a new database creation function that
has a similar API to n_d_open_with_config.
This commit is contained in:
David Bremner 2021-01-01 12:16:25 -04:00
parent b860be6a76
commit 1f860a6c41
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/open.cc
View file

@ -114,6 +114,36 @@ DONE:
return status; return status;
} }
static notmuch_status_t
_choose_database_path (const char *config_path,
const char *profile,
GKeyFile **key_file,
const char **database_path,
char **message)
{
notmuch_status_t status;
status =_load_key_file (config_path, profile, key_file);
if (status) {
*message = strdup ("Error: cannot load config file.\n");
return status;
}
if (! *database_path && *key_file)
*database_path = g_key_file_get_value (*key_file, "database", "path", NULL);
if (*database_path == NULL) {
*message = strdup ("Error: Cannot open a database for a NULL path.\n");
return NOTMUCH_STATUS_NULL_POINTER;
}
if (*database_path[0] != '/') {
*message = strdup ("Error: Database path must be absolute.\n");
return NOTMUCH_STATUS_PATH_ERROR;
}
return NOTMUCH_STATUS_SUCCESS;
}
notmuch_status_t notmuch_status_t
notmuch_database_open_with_config (const char *database_path, notmuch_database_open_with_config (const char *database_path,
notmuch_database_mode_t mode, notmuch_database_mode_t mode,
@ -133,26 +163,8 @@ notmuch_database_open_with_config (const char *database_path,
GKeyFile *key_file = NULL; GKeyFile *key_file = NULL;
static int initialized = 0; static int initialized = 0;
status = _load_key_file (config_path, profile, &key_file); if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
if (status) {
message = strdup ("Error: cannot load config file");
goto DONE; goto DONE;
}
if (! database_path && key_file)
database_path = g_key_file_get_value (key_file, "database", "path", NULL);
if (database_path == NULL) {
message = strdup ("Error: Cannot open a database for a NULL path.\n");
status = NOTMUCH_STATUS_NULL_POINTER;
goto DONE;
}
if (database_path[0] != '/') {
message = strdup ("Error: Database path must be absolute.\n");
status = NOTMUCH_STATUS_PATH_ERROR;
goto DONE;
}
if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) { if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
message = strdup ("Out of memory\n"); message = strdup ("Out of memory\n");