summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-06-02 14:38:45 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-06-02 14:38:45 +0000
commit115c025e67a7fbc92eeb4c1be6e26c547e2e6d60 (patch)
tree98be1fce3cd5cbc44ee446f9f5399e80af075cce
parent0c73dcfdb1949735dd24b6ddb76499fc36fc6d91 (diff)
The code to work out the path seems to work fine now on freebsd and linux, still to test on win
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7211 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/configreader.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 1d027ae93..11fd7f8c7 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1629,19 +1629,16 @@ std::string ServerConfig::GetFullProgDir()
// Get the current working directory
if (getcwd(buffer, PATH_MAX))
{
- ServerInstance->Log(DEBUG,"getcwd='%s', argv[0]='%s'", buffer, this->argv[0]);
std::string remainder = this->argv[0];
/* Does argv[0] start with /? its a full path, use it */
if (remainder[0] == '/')
{
- ServerInstance->Log(DEBUG,"argv starts with slash, using for full path.");
std::string::size_type n = remainder.rfind("/inspircd");
return std::string(remainder, 0, n);
}
std::string fullpath = std::string(buffer) + "/" + remainder;
- ServerInstance->Log(DEBUG,"Using concatenation: %s", fullpath.c_str());
std::string::size_type n = fullpath.rfind("/inspircd");
return std::string(fullpath, 0, n);
}