Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly expand '~' in mpd_host when preceded by a password.

Browse Source
This commit is contained in:
feral_hedgehog
2019-01-26 01:40:15 +02:00
parent 81cb7a4f85
commit 8304cb8e4c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/configuration.cpp
View File

@@ -63,8 +63,12 @@ std::string xdg_config_home()
void expand_home(std::string &path) void expand_home(std::string &path)
{ {
assert(env_home != nullptr); assert(env_home != nullptr);
if (!path.empty() && path[0] == '~') if (!path.empty())
path.replace(0, 1, env_home); {
size_t i = path.find("~");
if (i != std::string::npos && (i == 0 || path[i - 1] == '@'))
path.replace(i, 1, env_home);
}
} }
bool configure(int argc, char **argv) bool configure(int argc, char **argv)