diff options
| author |  Sadie Powell | 2025-02-16 11:28:40 +0000 |
|---|---|---|
| committer | Sadie Powell | 2025-02-16 11:28:40 +0000 |
| commit | c446fa0cea6e9d05ff476d658caf2dfbecd32cf2 (patch) | |
| tree | 89ae66525d6b296dff4795ee8a1a6a2a7bdbcb4d | |
| parent | Fix expanding paths on portable installations. (diff) | |
Use INSP_FORMAT in ExpandPath.
| -rw-r--r-- | src/configreader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index d49878baa..fc01b533d 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -74,9 +74,9 @@ std::string ServerConfig::ServerPaths::ExpandPath(const std::string& base, const if (!fragment.compare(0, 2, "~/", 2)) { // The fragment is relative to a home directory, expand that. - const char* homedir = getenv("HOME"); + const auto* homedir = getenv("HOME"); if (homedir && *homedir) - return std::string(homedir) + '/' + fragment.substr(2); + return INSP_FORMAT("{}/{}", homedir, fragment.substr(2)); } if (std::filesystem::path(base).is_relative()) @@ -87,7 +87,7 @@ std::string ServerConfig::ServerPaths::ExpandPath(const std::string& base, const return INSP_FORMAT("{}/{}/{}", cwd.string(), base, fragment); } - return base + '/' + fragment; + return INSP_FORMAT("{}/{}", base, fragment); } ServerConfig::ServerConfig() |