On Sat, Sep 08 2018, David Edmondson wrote:
> 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.
Series LGTM. Looked previous discussion, thought about using /etc/passwd
but $HOME is more flexible. Did not test, though...
Tomi
> ---
> notmuch-config.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> 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
> --
> 2.11.0
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
