From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: spwhitton@spwhitton.name
Subject: [PATCH 5/6] lib/open: return non-SUCCESS on missing database path
Date: Fri, 29 Jul 2022 09:20:00 -0300 [thread overview]
Message-ID: <20220729122001.1556787-6-david@tethera.net> (raw)
In-Reply-To: <20220729122001.1556787-1-david@tethera.net>
This simplifies the logic of creating the directory path when it doesn't
exist.
---
lib/open.cc | 19 +++++++++++--------
test/T560-lib-error.sh | 4 ++--
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/lib/open.cc b/lib/open.cc
index 85e46dc7..bc450555 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -192,6 +192,8 @@ _choose_database_path (notmuch_database_t *notmuch,
const char **database_path,
char **message)
{
+ notmuch_status_t status;
+
if (! *database_path) {
*database_path = getenv ("NOTMUCH_DATABASE");
}
@@ -207,8 +209,6 @@ _choose_database_path (notmuch_database_t *notmuch,
}
}
if (! *database_path) {
- notmuch_status_t status;
-
*database_path = _xdg_dir (notmuch, "XDG_DATA_HOME", ".local/share", profile);
status = _db_dir_exists (*database_path, message);
if (status) {
@@ -223,8 +223,6 @@ _choose_database_path (notmuch_database_t *notmuch,
}
if (! *database_path) {
- notmuch_status_t status;
-
*database_path = talloc_asprintf (notmuch, "%s/mail", getenv ("HOME"));
status = _db_dir_exists (*database_path, message);
if (status) {
@@ -241,6 +239,15 @@ _choose_database_path (notmuch_database_t *notmuch,
*message = strdup ("Error: Database path must be absolute.\n");
return NOTMUCH_STATUS_PATH_ERROR;
}
+
+ status = _db_dir_exists (*database_path, message);
+ if (status) {
+ IGNORE_RESULT (asprintf (message,
+ "Error: database path '%s' does not exist or is not a directory.\n",
+ *database_path));
+ return NOTMUCH_STATUS_NO_DATABASE;
+ }
+
return NOTMUCH_STATUS_SUCCESS;
}
@@ -638,10 +645,6 @@ notmuch_database_create_with_config (const char *database_path,
&database_path, &message)))
goto DONE;
- status = _db_dir_exists (database_path, &message);
- if (status)
- goto DONE;
-
_set_database_path (notmuch, database_path);
if (key_file && ! (notmuch->params & NOTMUCH_PARAM_SPLIT)) {
diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh
index a2901ff6..30cce943 100755
--- a/test/T560-lib-error.sh
+++ b/test/T560-lib-error.sh
@@ -91,7 +91,7 @@ EOF
cat <<'EOF' >EXPECTED
== stdout ==
== stderr ==
-Error: Cannot open database at CWD/nonexistent/foo: No such file or directory.
+Error: database path 'CWD/nonexistent/foo' does not exist or is not a directory.
EOF
test_expect_equal_file EXPECTED OUTPUT
@@ -132,7 +132,7 @@ EOF
cat <<'EOF' >EXPECTED
== stdout ==
== stderr ==
-Error: Cannot open database at CWD/nonexistent/foo: No such file or directory.
+Error: database path 'CWD/nonexistent/foo' does not exist or is not a directory.
EOF
test_expect_equal_file EXPECTED OUTPUT
--
2.35.2
next prev parent reply other threads:[~2022-07-29 12:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 12:19 v1 Create database directory David Bremner
2022-07-29 12:19 ` [PATCH 1/6] tests: remove dead code from T055-path-config.sh David Bremner
2022-08-06 12:19 ` David Bremner
2022-07-29 12:19 ` [PATCH 2/6] test: add test for creating database in various configurations David Bremner
2022-09-03 11:33 ` David Bremner
2022-07-29 12:19 ` [PATCH 3/6] test/path-config: set database.mail_root but not database.path David Bremner
2022-07-29 12:19 ` [PATCH 4/6] lib/open: refactor call to mkdir into function David Bremner
2022-07-29 12:20 ` David Bremner [this message]
2022-07-29 12:20 ` [PATCH 6/6] lib/open: create database path in some cases David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220729122001.1556787-6-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
--cc=spwhitton@spwhitton.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).