From 2ae96f567cf63dca595a37fd57d63d8d27a7a186 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 3 May 2015 14:52:11 +0200 Subject: path: start special espansion with ~~name instead of ~name Since commit 7381db60, strings like "~desktop/" were expanded as platform-specific paths by mpv. Apparently this similarity to standard Unix shell expansion caused confusion, so change it to "~~desktop/". The shell doesn't expand this, so it should be better. --- options/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'options') diff --git a/options/path.c b/options/path.c index 742e292eb1..ddcc8d1ece 100644 --- a/options/path.c +++ b/options/path.c @@ -182,7 +182,7 @@ char *mp_get_user_path(void *talloc_ctx, struct mpv_global *global, res = mp_find_config_file(talloc_ctx, global, rest0); } else if (bstr_equals0(prefix, "")) { res = mp_path_join(talloc_ctx, bstr0(getenv("HOME")), rest); - } else { + } else if (bstr_eatstart0(&prefix, "~")) { char type[80]; snprintf(type, sizeof(type), "%.*s", BSTR_P(prefix)); const char *p = mp_get_platform_path(talloc_ctx, type); -- cgit v1.2.3