ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix expanding paths on portable installations.

Browse Source 
Closes #2148.
This commit is contained in:
Sadie Powell 2025-02-15 14:24:43 +00:00
parent ec57c7545d
commit 6c2100a2e4
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/inspircd.h
View File

@ -237,7 +237,7 @@ public:
XLineManager* XLines = nullptr;
/** The current server configuration file from --config or configure. */
std::string ConfigFileName = INSPIRCD_CONFIG_PATH "/inspircd.conf";
std::string ConfigFileName;
/** Fills a buffer with random bytes. */
std::function<void(char*, size_t)> GenRandom = &DefaultGenRandom;

10
src/configreader.cpp
View File

@ -71,14 +71,22 @@ std::string ServerConfig::ServerPaths::ExpandPath(const std::string& base, const
if (std::filesystem::path(fragment).is_absolute())
return fragment;
// The fragment is relative to a home directory, expand that.
if (!fragment.compare(0, 2, "~/", 2))
{
// The fragment is relative to a home directory, expand that.
const char* homedir = getenv("HOME");
if (homedir && *homedir)
return std::string(homedir) + '/' + fragment.substr(2);
}
if (std::filesystem::path(base).is_relative())
{
// The base is relative to the working directory, expand that.
const auto cwd = std::filesystem::current_path();
if (!cwd.empty())
return INSP_FORMAT("{}/{}/{}", cwd.string(), base, fragment);
}
return base + '/' + fragment;
}

2
src/inspircd.cpp
View File

@ -255,7 +255,7 @@ namespace
// Parses the command line options.
void ParseOptions()
{
std::string config;
std::string config = ServerInstance->Config->Paths.PrependConfig("inspircd.conf");
bool do_debug = false;
bool do_help = false;
bool do_nofork = false;