From: David Edmondson <dme@dme.org>
Date: Sat, 8 Sep 2018 11:49:40 +0000 (+0100)
Subject: notmuch: Database paths without a leading / are relative to $HOME
X-Git-Tag: debian/0.28_rc0-1~19
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=95a9c73c72ff61d5514010a1b9bc11f94cbe988c

notmuch: Database paths without a leading / are relative to $HOME

If the database path specified in the configuration file does *not*
start with a /, presume that it is relative to $HOME and modify the
path used to open the database accordingly.
---

diff --git a/notmuch-config.c b/notmuch-config.c
index e1b16609..bf77cc9d 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -660,7 +660,19 @@ _config_set_list (notmuch_config_t *config,
 const char *
 notmuch_config_get_database_path (notmuch_config_t *config)
 {
-    return _config_get (config, &config->database_path, "database", "path");
+    char *db_path = (char *)_config_get (config, &config->database_path, "database", "path");
+
+    if (db_path && *db_path != '/') {
+	/* If the path in the configuration file begins with any
+	 * character other than /, presume that it is relative to
+	 * $HOME and update as appropriate.
+	 */
+	char *abs_path = talloc_asprintf (config, "%s/%s", getenv ("HOME"), db_path);
+	talloc_free (db_path);
+	db_path = config->database_path = abs_path;
+    }
+
+    return db_path;
 }
 
 void