Make checks more uniform between creating new databases and opening existing ones. --- lib/open.cc | 50 +++++++++++++++++++++++++++--------------- test/T560-lib-error.sh | 4 ++-- 2 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/lib/open.cc b/lib/open.cc index f4690763..b5a56e73 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -152,6 +152,29 @@ DONE: 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 (const char *config_path, const char *profile, @@ -379,6 +402,10 @@ notmuch_database_open_with_config (const char *database_path, if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message))) goto DONE; + status = _db_dir_exists (database_path, &message); + if (status) + goto DONE; + notmuch->path = talloc_strdup (notmuch, database_path); strip_trailing (notmuch->path, '/'); @@ -462,9 +489,8 @@ notmuch_database_create_with_config (const char *database_path, char *xapian_path = NULL; char *message = NULL; GKeyFile *key_file = NULL; - struct stat st; - int err; void *local = talloc_new (NULL); + int err; notmuch = _alloc_notmuch (); if (! notmuch) { @@ -475,24 +501,12 @@ notmuch_database_create_with_config (const char *database_path, if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message))) goto DONE; - notmuch->path = talloc_strdup (notmuch, database_path); - strip_trailing (notmuch->path, '/'); - - 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; - } + notmuch->path = talloc_strdup (notmuch, database_path); + strip_trailing (notmuch->path, '/'); notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"); diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index ade376ef..03df69d9 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -76,7 +76,7 @@ EOF cat <<'EOF' >EXPECTED == stdout == == stderr == -Error opening database at CWD/nonexistent/foo/.notmuch: No such file or directory +Error: Cannot open database at CWD/nonexistent/foo: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT @@ -111,7 +111,7 @@ EOF cat <<'EOF' >EXPECTED == stdout == == stderr == -Error: Cannot create database at CWD/nonexistent/foo: No such file or directory. +Error: Cannot open database at CWD/nonexistent/foo: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.0 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org