#include <unistd.h>
+#include <libgen.h>
+
#include "database-private.h"
#include "parse-time-vrp.h"
}
static notmuch_status_t
-_choose_hook_dir (notmuch_database_t *notmuch,
- const char *profile,
- char **message)
+_choose_dir (notmuch_database_t *notmuch,
+ const char *profile,
+ notmuch_config_key_t key,
+ const char *xdg_var,
+ const char *xdg_subdir,
+ const char *subdir,
+ char **message = NULL)
{
- const char *config;
- const char *hook_dir;
+ const char *parent;
+ const char *dir;
struct stat st;
int err;
- hook_dir = notmuch_config_get (notmuch, NOTMUCH_CONFIG_HOOK_DIR);
+ dir = notmuch_config_get (notmuch, key);
- if (hook_dir)
+ if (dir)
return NOTMUCH_STATUS_SUCCESS;
- config = _xdg_dir (notmuch, "XDG_CONFIG_HOME", ".config", profile);
- if (! config)
+ parent = _xdg_dir (notmuch, xdg_var, xdg_subdir, profile);
+ if (! parent)
return NOTMUCH_STATUS_PATH_ERROR;
- hook_dir = talloc_asprintf (notmuch, "%s/hooks", config);
+ dir = talloc_asprintf (notmuch, "%s/%s", parent, subdir);
- err = stat (hook_dir, &st);
+ err = stat (dir, &st);
if (err) {
if (errno == ENOENT) {
- const char *database_path = notmuch_database_get_path (notmuch);
- hook_dir = talloc_asprintf (notmuch, "%s/.notmuch/hooks", database_path);
+ char *notmuch_path = dirname (talloc_strdup (notmuch, notmuch->xapian_path));
+ dir = talloc_asprintf (notmuch, "%s/%s", notmuch_path, subdir);
} else {
IGNORE_RESULT (asprintf (message, "Error: Cannot stat %s: %s.\n",
- hook_dir, strerror (errno)));
+ dir, strerror (errno)));
return NOTMUCH_STATUS_FILE_ERROR;
}
}
- _notmuch_config_cache (notmuch, NOTMUCH_CONFIG_HOOK_DIR, hook_dir);
+ _notmuch_config_cache (notmuch, key, dir);
return NOTMUCH_STATUS_SUCCESS;
}
static notmuch_status_t
_choose_database_path (void *ctx,
- const char *config_path,
const char *profile,
- GKeyFile **key_file,
+ GKeyFile *key_file,
const char **database_path,
+ bool *split,
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) {
*database_path = getenv ("NOTMUCH_DATABASE");
}
- if (! *database_path && *key_file) {
- char *path = g_key_file_get_value (*key_file, "database", "path", NULL);
+ if (! *database_path && key_file) {
+ char *path = g_key_file_get_value (key_file, "database", "path", NULL);
if (path) {
*database_path = talloc_strdup (ctx, path);
g_free (path);
}
}
+ if (! *database_path) {
+ *database_path = _xdg_dir (ctx, "XDG_DATA_HOME", ".local/share", profile);
+ *split = true;
+ }
+
if (*database_path == NULL) {
*message = strdup ("Error: Cannot open a database for a NULL path.\n");
return NOTMUCH_STATUS_NULL_POINTER;
return NOTMUCH_STATUS_SUCCESS;
}
-static notmuch_status_t
-_choose_xapian_path (void *ctx, const char *database_path, const char **xapian_path,
- char **message_ptr)
+notmuch_status_t
+_notmuch_choose_xapian_path (void *ctx, const char *database_path,
+ const char **xapian_path, char **message_ptr)
{
notmuch_status_t status;
const char *trial_path, *notmuch_path;
if (status != NOTMUCH_STATUS_PATH_ERROR)
goto DONE;
+ if (*message_ptr)
+ free (*message_ptr);
+
notmuch_path = talloc_asprintf (ctx, "%s/.notmuch", database_path);
status = _db_dir_exists (notmuch_path, message_ptr);
if (status)
if (status)
goto DONE;
- status = _choose_hook_dir (notmuch, profile, &message);
+ status = _choose_dir (notmuch, profile,
+ NOTMUCH_CONFIG_HOOK_DIR,
+ "XDG_CONFIG_HOME",
+ ".config",
+ "hooks",
+ &message);
if (status)
goto DONE;
+ status = _choose_dir (notmuch, profile,
+ NOTMUCH_CONFIG_BACKUP_DIR,
+ "XDG_DATA_HOME",
+ ".local/share",
+ "backups",
+ &message);
+ if (status)
+ goto DONE;
status = _notmuch_config_load_defaults (notmuch);
if (status)
goto DONE;
notmuch_database_t *notmuch = NULL;
char *message = NULL;
GKeyFile *key_file = NULL;
+ bool split = false;
_init_libs ();
goto DONE;
}
- if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path,
+ status = _load_key_file (config_path, profile, &key_file);
+ if (status) {
+ message = strdup ("Error: cannot load config file.\n");
+ goto DONE;
+ }
+
+ if ((status = _choose_database_path (local, profile, key_file,
+ &database_path, &split,
&message)))
goto DONE;
_set_database_path (notmuch, database_path);
- status = _choose_xapian_path (notmuch, database_path, ¬much->xapian_path, &message);
+ status = _notmuch_choose_xapian_path (notmuch, database_path,
+ ¬much->xapian_path, &message);
if (status)
goto DONE;
{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
notmuch_database_t *notmuch = NULL;
- char *notmuch_path = NULL;
+ const char *notmuch_path = NULL;
char *message = NULL;
GKeyFile *key_file = NULL;
void *local = talloc_new (NULL);
int err;
+ bool split = false;
_init_libs ();
goto DONE;
}
- _init_libs ();
+ status = _load_key_file (config_path, profile, &key_file);
+ if (status) {
+ message = strdup ("Error: cannot load config file.\n");
+ goto DONE;
+ }
- if ((status = _choose_database_path (local, config_path, profile,
- &key_file, &database_path, &message)))
+ if ((status = _choose_database_path (local, profile, key_file,
+ &database_path, &split, &message)))
goto DONE;
status = _db_dir_exists (database_path, &message);
_set_database_path (notmuch, database_path);
- notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch");
+ if (key_file && ! split) {
+ char *mail_root = canonicalize_file_name (
+ g_key_file_get_value (key_file, "database", "mail_root", NULL));
+ char *db_path = canonicalize_file_name (database_path);
- err = mkdir (notmuch_path, 0755);
- if (err) {
- if (errno == EEXIST) {
- status = NOTMUCH_STATUS_DATABASE_EXISTS;
- talloc_free (notmuch);
- notmuch = NULL;
- } else {
- IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
- notmuch_path, strerror (errno)));
- status = NOTMUCH_STATUS_FILE_ERROR;
+ split = (mail_root && (0 != strcmp (mail_root, db_path)));
+
+ free (mail_root);
+ free (db_path);
+ }
+
+ if (split) {
+ notmuch_path = database_path;
+ } else {
+ if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
+ err = mkdir (notmuch_path, 0755);
+ if (err) {
+ if (errno == EEXIST) {
+ status = NOTMUCH_STATUS_DATABASE_EXISTS;
+ talloc_free (notmuch);
+ notmuch = NULL;
+ } else {
+ IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
+ notmuch_path, strerror (errno)));
+ status = NOTMUCH_STATUS_FILE_ERROR;
+ }
+ goto DONE;
}
- goto DONE;
}
if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) {
goto DONE;
}
+ status = _trial_open (notmuch->xapian_path, &message);
+ if (status == NOTMUCH_STATUS_SUCCESS) {
+ notmuch_database_destroy (notmuch);
+ notmuch = NULL;
+ status = NOTMUCH_STATUS_DATABASE_EXISTS;
+ goto DONE;
+ }
+
+ if (message)
+ free (message);
+
status = _finish_open (notmuch,
profile,
NOTMUCH_DATABASE_MODE_READ_WRITE,
projects / notmuch / blobdiff