X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fopen.cc;h=8fc17cafaa939ac8b97b3a7c31f181304ef0d5f4;hb=e823d05ae6dc920d4fc9abf774c3d2575d891d7b;hp=7fc9a14ffbb8d9608eb2f55c319118b54afe89f2;hpb=6251e2bb9ee023d25b58384c8a49576086fdaba3;p=notmuch diff --git a/lib/open.cc b/lib/open.cc index 7fc9a14f..8fc17caf 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -152,6 +152,29 @@ _load_key_file (const char *path, return status; } +static notmuch_status_t +_db_dir_exists (const char *database_path, char **message) +{ + struct stat st; + int err; + + err = stat (database_path, &st); + if (err) { + IGNORE_RESULT (asprintf (message, "Error: Cannot open database at %s: %s.\n", + database_path, strerror (errno))); + return NOTMUCH_STATUS_FILE_ERROR; + } + + if (! S_ISDIR (st.st_mode)) { + IGNORE_RESULT (asprintf (message, "Error: Cannot open database at %s: " + "Not a directory.\n", + database_path)); + return NOTMUCH_STATUS_FILE_ERROR; + } + + return NOTMUCH_STATUS_SUCCESS; +} + static notmuch_status_t _choose_database_path (void *ctx, const char *config_path, @@ -209,6 +232,56 @@ _alloc_notmuch () return notmuch; } +static notmuch_status_t +_trial_open (const char *xapian_path, char **message_ptr) +{ + try { + Xapian::Database db (xapian_path); + } catch (const Xapian::DatabaseOpeningError &error) { + IGNORE_RESULT (asprintf (message_ptr, + "Cannot open Xapian database at %s: %s\n", + xapian_path, + error.get_msg ().c_str ())); + return NOTMUCH_STATUS_PATH_ERROR; + } catch (const Xapian::Error &error) { + IGNORE_RESULT (asprintf (message_ptr, + "A Xapian exception occurred opening database: %s\n", + error.get_msg ().c_str ())); + return NOTMUCH_STATUS_XAPIAN_EXCEPTION; + } + 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 status; + const char *trial_path, *notmuch_path; + + status = _db_dir_exists (database_path, message_ptr); + if (status) + goto DONE; + + trial_path = talloc_asprintf (ctx, "%s/xapian", database_path); + status = _trial_open (trial_path, message_ptr); + if (status != NOTMUCH_STATUS_PATH_ERROR) + goto DONE; + + notmuch_path = talloc_asprintf (ctx, "%s/.notmuch", database_path); + status = _db_dir_exists (notmuch_path, message_ptr); + if (status) + goto DONE; + + trial_path = talloc_asprintf (ctx, "%s/xapian", notmuch_path); + status = _trial_open (trial_path, message_ptr); + + DONE: + if (status == NOTMUCH_STATUS_SUCCESS) + *xapian_path = trial_path; + return status; +} + static void _set_database_path (notmuch_database_t *notmuch, const char *database_path) @@ -220,56 +293,11 @@ _set_database_path (notmuch_database_t *notmuch, _notmuch_config_cache (notmuch, NOTMUCH_CONFIG_DATABASE_PATH, path); } -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 void +_init_libs () { - notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; - void *local = talloc_new (NULL); - notmuch_database_t *notmuch = NULL; - char *notmuch_path, *incompat_features; - char *message = NULL; - struct stat st; - int err; - unsigned int version; - GKeyFile *key_file = NULL; - static int initialized = 0; - - notmuch = _alloc_notmuch (); - if (! notmuch) { - status = NOTMUCH_STATUS_OUT_OF_MEMORY; - goto DONE; - } - - if ((status = _choose_database_path (local, config_path, profile, - &key_file, &database_path, &message))) - goto DONE; - - _set_database_path (notmuch, database_path); - - 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; - } - err = stat (notmuch_path, &st); - if (err) { - IGNORE_RESULT (asprintf (&message, "Error opening database at %s: %s\n", - notmuch_path, strerror (errno))); - status = NOTMUCH_STATUS_FILE_ERROR; - goto DONE; - } - - if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) { - message = strdup ("Out of memory\n"); - status = NOTMUCH_STATUS_OUT_OF_MEMORY; - goto DONE; - } + static int initialized = 0; /* Initialize the GLib type system and threads */ #if ! GLIB_CHECK_VERSION (2, 35, 1) @@ -281,6 +309,20 @@ notmuch_database_open_with_config (const char *database_path, g_mime_init (); initialized = 1; } +} + +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; + char *incompat_features; + char *message = NULL; + unsigned int version; + const char *database_path = notmuch_database_get_path (notmuch); try { std::string last_thread_id; @@ -303,7 +345,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; @@ -313,7 +355,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) { @@ -321,7 +363,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; @@ -401,6 +443,49 @@ 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 *message = NULL; + GKeyFile *key_file = NULL; + + _init_libs (); + + notmuch = _alloc_notmuch (); + if (! notmuch) { + status = NOTMUCH_STATUS_OUT_OF_MEMORY; + goto DONE; + } + + if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path, + &message))) + goto DONE; + + status = _db_dir_exists (database_path, &message); + if (status) + goto DONE; + + _set_database_path (notmuch, database_path); + + status = _choose_xapian_path (notmuch, database_path, ¬much->xapian_path, &message); + if (status) + goto DONE; + + status = _finish_open (notmuch, profile, mode, key_file, &message); DONE: talloc_free (local); @@ -463,29 +548,28 @@ notmuch_database_create_with_config (const char *database_path, char *notmuch_path = NULL; char *message = NULL; GKeyFile *key_file = NULL; - struct stat st; - int err; void *local = talloc_new (NULL); + int err; + + _init_libs (); + + notmuch = _alloc_notmuch (); + if (! notmuch) { + status = NOTMUCH_STATUS_OUT_OF_MEMORY; + goto DONE; + } + + _init_libs (); if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path, &message))) goto DONE; - err = stat (database_path, &st); - if (err) { - IGNORE_RESULT (asprintf (&message, "Error: Cannot create database at %s: %s.\n", - database_path, strerror (errno))); - status = NOTMUCH_STATUS_FILE_ERROR; + status = _db_dir_exists (database_path, &message); + if (status) goto DONE; - } - if (! S_ISDIR (st.st_mode)) { - IGNORE_RESULT (asprintf (&message, "Error: Cannot create database at %s: " - "Not a directory.\n", - database_path)); - status = NOTMUCH_STATUS_FILE_ERROR; - goto DONE; - } + _set_database_path (notmuch, database_path); notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"); @@ -493,6 +577,8 @@ notmuch_database_create_with_config (const char *database_path, 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))); @@ -501,12 +587,16 @@ notmuch_database_create_with_config (const char *database_path, goto DONE; } - /* XXX this reads the config file twice, which is a bit wasteful */ - status = notmuch_database_open_with_config (database_path, - NOTMUCH_DATABASE_MODE_READ_WRITE, - config_path, - profile, - ¬much, &message); + if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) { + status = NOTMUCH_STATUS_OUT_OF_MEMORY; + goto DONE; + } + + status = _finish_open (notmuch, + profile, + NOTMUCH_DATABASE_MODE_READ_WRITE, + key_file, + &message); if (status) goto DONE;