debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/open: canonicalize relative path read from config file

Browse source 
This matches functionality in the the CLI function
notmuch_config_get_database_path, which was previously used in the CLI
code for all calls to open a database.
This commit is contained in:
David Bremner 2021-03-03 08:31:44 -04:00
parent 2e9ee47072
commit b25e57e6cb
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/open.cc
View file

@ -196,11 +196,13 @@ _choose_database_path (void *ctx,
if (! *database_path && key_file) { if (! *database_path && key_file) {
char *path = g_key_file_get_value (key_file, "database", "path", NULL); char *path = g_key_file_get_value (key_file, "database", "path", NULL);
if (path) { if (path) {
*database_path = talloc_strdup (ctx, path); if (path[0] == '/')
*database_path = talloc_strdup (ctx, path);
else
*database_path = talloc_asprintf (ctx, "%s/%s", getenv ("HOME"), path);
g_free (path); g_free (path);
} }
} }
if (! *database_path) { if (! *database_path) {
*database_path = _xdg_dir (ctx, "XDG_DATA_HOME", ".local/share", profile); *database_path = _xdg_dir (ctx, "XDG_DATA_HOME", ".local/share", profile);
*split = true; *split = true;