lib/open: return non-SUCCESS on missing database path

[notmuch] / lib / open.cc

diff --git a/lib/open.cc b/lib/open.cc
index 30cfcf9e6a985728cc4c21024aed70eb72c1cf38..bc45055523588d7ff6bf58b381b9b06274704659 100644 (file)
--- 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,9 +239,30 @@ _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;
+}
+
+static notmuch_status_t
+_mkdir (const char *path, char **message)
+{
+    if (g_mkdir_with_parents (path, 0755)) {
+       IGNORE_RESULT (asprintf (message, "Error: Cannot create directory %s: %s.\n",
+                                path, strerror (errno)));
+       return NOTMUCH_STATUS_FILE_ERROR;
+    }
     return NOTMUCH_STATUS_SUCCESS;
 }
 
+
 static notmuch_database_t *
 _alloc_notmuch (const char *database_path, const char *config_path, const char *profile)
 {
@@ -607,7 +626,6 @@ notmuch_database_create_with_config (const char *database_path,
     const char *notmuch_path = NULL;
     char *message = NULL;
     GKeyFile *key_file = NULL;
-    int err;
 
     _notmuch_init ();
 
@@ -627,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)) {
@@ -653,15 +667,9 @@ notmuch_database_create_with_config (const char *database_path,
            goto DONE;
        }
 
-       err = mkdir (notmuch_path, 0755);
-       if (err) {
-           if (errno != EEXIST) {
-               IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n",
-                                        notmuch_path, strerror (errno)));
-               status = NOTMUCH_STATUS_FILE_ERROR;
-               goto DONE;
-           }
-       }
+       status = _mkdir (notmuch_path, &message);
+       if (status)
+           goto DONE;
     }
 
     if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) {