Merge pull request #327 from FeralHedgehog/expand_with_password

Expand '~' in mpd_host when preceded by a password.
2019-09-30 18:12:11 -05:00
parent 6001a639da 8304cb8e4c
commit 94bfe04994
1 changed files with 6 additions and 2 deletions
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -63,8 +63,12 @@ std::string xdg_config_home()
 void expand_home(std::string &path)
 {
 	assert(env_home != nullptr);
-	if (!path.empty() && path[0] == '~')
-		path.replace(0, 1, env_home);
+	if (!path.empty())
+	{
+		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)