diff options
author | wm4 <wm4@nowhere> | 2015-05-03 14:52:11 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-05-03 14:52:11 +0200 |
commit | 2ae96f567cf63dca595a37fd57d63d8d27a7a186 (patch) | |
tree | 6895b1fa4423db6d0bd971d663fe77a38fe0fa1c /options/path.c | |
parent | 6a03357b7123e5b3c59d3038c3dae491384a08ef (diff) | |
download | mpv-2ae96f567cf63dca595a37fd57d63d8d27a7a186.tar.bz2 mpv-2ae96f567cf63dca595a37fd57d63d8d27a7a186.tar.xz |
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.
Diffstat (limited to 'options/path.c')
-rw-r--r-- | options/path.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |