* [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME
@ 2018-09-08 11:49 David Edmondson
2018-09-08 11:49 ` [PATCH v2 2/2] test: Absolute and relative directory paths David Edmondson
2018-09-08 14:28 ` [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME Tomi Ollila
0 siblings, 2 replies; 4+ messages in thread
From: David Edmondson @ 2018-09-08 11:49 UTC (permalink / raw
To: notmuch
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.
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] test: Absolute and relative directory paths.
2018-09-08 11:49 [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME David Edmondson
@ 2018-09-08 11:49 ` David Edmondson
2018-09-08 14:28 ` [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME Tomi Ollila
1 sibling, 0 replies; 4+ messages in thread
From: David Edmondson @ 2018-09-08 11:49 UTC (permalink / raw
To: notmuch
---
test/T030-config.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/test/T030-config.sh b/test/T030-config.sh
index e91c3659..f36695c6 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -99,4 +99,14 @@ test_expect_equal "$(notmuch --config=alt-config-link config get user.name)" \
test_begin_subtest "Writing config file through symlink follows symlink"
test_expect_equal "$(readlink alt-config-link)" "alt-config"
+test_begin_subtest "Absolute database path returned"
+notmuch config set database.path ${HOME}/Maildir
+test_expect_equal "$(notmuch config get database.path)" \
+ "${HOME}/Maildir"
+
+test_begin_subtest "Relative database path properly expanded"
+notmuch config set database.path Maildir
+test_expect_equal "$(notmuch config get database.path)" \
+ "${HOME}/Maildir"
+
test_done
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME
2018-09-08 11:49 [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME David Edmondson
2018-09-08 11:49 ` [PATCH v2 2/2] test: Absolute and relative directory paths David Edmondson
@ 2018-09-08 14:28 ` Tomi Ollila
2018-09-08 23:49 ` David Bremner
1 sibling, 1 reply; 4+ messages in thread
From: Tomi Ollila @ 2018-09-08 14:28 UTC (permalink / raw
To: David Edmondson, notmuch
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME
2018-09-08 14:28 ` [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME Tomi Ollila
@ 2018-09-08 23:49 ` David Bremner
0 siblings, 0 replies; 4+ messages in thread
From: David Bremner @ 2018-09-08 23:49 UTC (permalink / raw
To: Tomi Ollila, David Edmondson, notmuch
Tomi Ollila <tomi.ollila@iki.fi> writes:
> 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...
>
Series pushed to master.
d
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-08 23:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-08 11:49 [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME David Edmondson
2018-09-08 11:49 ` [PATCH v2 2/2] test: Absolute and relative directory paths David Edmondson
2018-09-08 14:28 ` [PATCH v2 1/2] notmuch: Database paths without a leading / are relative to $HOME Tomi Ollila
2018-09-08 23:49 ` David Bremner
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).