lib: provide notmuch_config_path

[notmuch] / lib / open.cc

diff --git a/lib/open.cc b/lib/open.cc
index d0493950ff0d48877c8536b0f6535110bde2bbe0..5d80a884fb35aecbc6f084505ccb80ce85c8fec7 100644 (file)
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -113,12 +113,12 @@ _choose_dir (notmuch_database_t *notmuch,
 }
 
 static notmuch_status_t
-_load_key_file (const char *path,
+_load_key_file (notmuch_database_t *notmuch,
+               const char *path,
                const char *profile,
                GKeyFile **key_file)
 {
     notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
-    void *local = talloc_new (NULL);
 
     if (path && EMPTY_STRING (path))
        goto DONE;
@@ -126,11 +126,13 @@ _load_key_file (const char *path,
     if (! path)
        path = getenv ("NOTMUCH_CONFIG");
 
-    if (! path) {
-       const char *dir = _xdg_dir (local, "XDG_CONFIG_HOME", ".config", profile);
+    if (path)
+       path = talloc_strdup (notmuch, path);
+    else {
+       const char *dir = _xdg_dir (notmuch, "XDG_CONFIG_HOME", ".config", profile);
 
        if (dir) {
-           path = talloc_asprintf (local, "%s/config", dir);
+           path = talloc_asprintf (notmuch, "%s/config", dir);
            if (access (path, R_OK) != 0)
                path = NULL;
        }
@@ -139,13 +141,13 @@ _load_key_file (const char *path,
     if (! path) {
        const char *home = getenv ("HOME");
 
-       path = talloc_asprintf (local, "%s/.notmuch-config", home);
+       path = talloc_asprintf (notmuch, "%s/.notmuch-config", home);
 
        if (! profile)
            profile = getenv ("NOTMUCH_PROFILE");
 
        if (profile)
-           path = talloc_asprintf (local, "%s.%s", path, profile);
+           path = talloc_asprintf (notmuch, "%s.%s", path, profile);
     }
 
     *key_file = g_key_file_new ();
@@ -154,7 +156,9 @@ _load_key_file (const char *path,
     }
 
   DONE:
-    talloc_free (local);
+    if (path)
+       notmuch->config_path = path;
+
     return status;
 }
 
@@ -209,8 +213,8 @@ _choose_database_path (void *ctx,
     }
 
     if (*database_path == NULL) {
-       *message = strdup ("Error: Cannot open a database for a NULL path.\n");
-       return NOTMUCH_STATUS_NULL_POINTER;
+       *message = strdup ("Error: could not locate database.\n");
+       return NOTMUCH_STATUS_NO_DATABASE;
     }
 
     if (*database_path[0] != '/') {
@@ -232,6 +236,7 @@ _alloc_notmuch ()
     notmuch->exception_reported = false;
     notmuch->status_string = NULL;
     notmuch->writable_xapian_db = NULL;
+    notmuch->config_path = NULL;
     notmuch->atomic_nesting = 0;
     notmuch->view = 1;
     return notmuch;
@@ -493,7 +498,7 @@ notmuch_database_open_with_config (const char *database_path,
        goto DONE;
     }
 
-    status = _load_key_file (config_path, profile, &key_file);
+    status = _load_key_file (notmuch, config_path, profile, &key_file);
     if (status) {
        message = strdup ("Error: cannot load config file.\n");
        goto DONE;
@@ -590,7 +595,7 @@ notmuch_database_create_with_config (const char *database_path,
        goto DONE;
     }
 
-    status = _load_key_file (config_path, profile, &key_file);
+    status = _load_key_file (notmuch, config_path, profile, &key_file);
     if (status) {
        message = strdup ("Error: cannot load config file.\n");
        goto DONE;
@@ -750,12 +755,12 @@ _maybe_load_config_from_database (notmuch_database_t *notmuch,
     char *message; /* ignored */
 
     if (_db_dir_exists (database_path, &message))
-       return NOTMUCH_STATUS_SUCCESS;
+       return NOTMUCH_STATUS_NO_DATABASE;
 
     _set_database_path (notmuch, database_path);
 
     if (_notmuch_choose_xapian_path (notmuch, database_path, &notmuch->xapian_path, &message))
-       return NOTMUCH_STATUS_SUCCESS;
+       return NOTMUCH_STATUS_NO_DATABASE;
 
     (void) _finish_open (notmuch, profile, NOTMUCH_DATABASE_MODE_READ_ONLY, key_file, &message);
 
@@ -784,9 +789,10 @@ notmuch_database_load_config (const char *database_path,
        goto DONE;
     }
 
-    status = _load_key_file (config_path, profile, &key_file);
+    status = _load_key_file (notmuch, config_path, profile, &key_file);
     switch (status) {
     case NOTMUCH_STATUS_SUCCESS:
+       break;
     case NOTMUCH_STATUS_NO_CONFIG:
        warning = status;
        break;
@@ -798,19 +804,27 @@ notmuch_database_load_config (const char *database_path,
     status = _choose_database_path (local, profile, key_file,
                                    &database_path, &split, &message);
     switch (status) {
-    /* weirdly NULL_POINTER is what is returned if we fail to find
-     * a database */
-    case NOTMUCH_STATUS_NULL_POINTER:
+    case NOTMUCH_STATUS_NO_DATABASE:
     case NOTMUCH_STATUS_SUCCESS:
+       if (! warning)
+           warning = status;
        break;
     default:
        goto DONE;
     }
 
+
     if (database_path) {
        status = _maybe_load_config_from_database (notmuch, key_file, database_path, profile);
-       if (status)
+       switch (status) {
+       case NOTMUCH_STATUS_NO_DATABASE:
+       case NOTMUCH_STATUS_SUCCESS:
+           if (! warning)
+               warning = status;
+           break;
+       default:
            goto DONE;
+       }
     }
 
     if (key_file) {