X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=70c99e8ae4f7257a7a28a6b315b336d91bc43dfb;hb=37fd031da06761c8a050105b55d73a8ab499fb74;hp=ac0dc2596604ac760be6d9f425011ec88f29b5c7;hpb=9aa6c07d92fb9c1132f06b8c5781d77ee7086edb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index ac0dc2596..70c99e8ae 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -382,14 +382,6 @@ static bool ValidateModeLists(ServerConfig* conf, const char*, const char*, Valu
 	return true;
 }
 
-static bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueItem &data)
-{
-	memset(conf->ExemptChanOps, 0, sizeof(conf->ExemptChanOps));
-	for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
-		conf->ExemptChanOps[*x] = true;
-	return true;
-}
-
 static bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
 	const std::string& v = data.GetValue();
@@ -801,7 +793,6 @@ static const InitialConfig Values[] = {
 	{"security",	"announceinvites", "1",			NULL, DT_NOTHING,  ValidateInvite},
 	{"options",	"hostintopic",	"1",			new ValueContainerBool (&ServerConfig::FullHostInTopic),	DT_BOOLEAN,  NULL},
 	{"security",	"hidemodes",	"",			NULL, DT_NOTHING,  ValidateModeLists},
-	{"options",	"exemptchanops","",			NULL, DT_NOTHING,  ValidateExemptChanOps},
 	{"security",	"maxtargets",	"20",			new ValueContainerUInt (&ServerConfig::MaxTargets),		DT_INTEGER,  ValidateMaxTargets},
 	{"options",	"defaultmodes", "nt",			new ValueContainerString (&ServerConfig::DefaultModes),		DT_CHARPTR,  NULL},
 	{"pid",		"file",		"",			new ValueContainerString (&ServerConfig::PID),			DT_CHARPTR,  NULL},
@@ -1670,36 +1661,12 @@ bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path)
 
 bool ServerConfig::DoInclude(const std::string &file, bool allowexeinc)
 {
-	std::string confpath;
-	std::string newfile;
-	std::string::size_type pos;
-
-	confpath = ServerInstance->ConfigFileName;
-	newfile = file;
-
-	std::replace(newfile.begin(),newfile.end(),'\\','/');
-	std::replace(confpath.begin(),confpath.end(),'\\','/');
-
-	if ((newfile[0] != '/') && (!StartsWithWindowsDriveLetter(newfile)))
-	{
-		if((pos = confpath.rfind("/")) != std::string::npos)
-		{
-			/* Leaves us with just the path */
-			newfile = confpath.substr(0, pos) + std::string("/") + newfile;
-		}
-		else
-		{
-			errstr << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
-			return false;
-		}
-	}
-
-	FILE* conf = fopen(newfile.c_str(), "r");
+	FILE* conf = fopen(file.c_str(), "r");
 	bool ret = false;
 
 	if (conf)
 	{
-		ret = LoadConf(conf, newfile, allowexeinc);
+		ret = LoadConf(conf, file, allowexeinc);
 		fclose(conf);
 	}
 	else
@@ -1902,29 +1869,9 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname)
 
 	F.clear();
 
-	if ((*fname != '/') && (*fname != '\\') && (!StartsWithWindowsDriveLetter(fname)))
-	{
-		std::string::size_type pos;
-		std::string confpath = ServerInstance->ConfigFileName;
-		std::string newfile = fname;
-
-		if (((pos = confpath.rfind("/"))) != std::string::npos)
-			newfile = confpath.substr(0, pos) + std::string("/") + fname;
-		else if (((pos = confpath.rfind("\\"))) != std::string::npos)
-			newfile = confpath.substr(0, pos) + std::string("\\") + fname;
-
-		ServerInstance->Logs->Log("config", DEBUG, "Filename: %s", newfile.c_str());
-
-		if (!FileExists(newfile.c_str()))
-			return false;
-		file =  fopen(newfile.c_str(), "r");
-	}
-	else
-	{
-		if (!FileExists(fname))
-			return false;
-		file =  fopen(fname, "r");
-	}
+	if (!FileExists(fname))
+		return false;
+	file = fopen(fname, "r");
 
 	if (file)
 	{
@@ -1955,8 +1902,8 @@ bool ServerConfig::FileExists(const char* file)
 	if ((sb.st_mode & S_IFDIR) > 0)
 		return false;
 
-	FILE *input;
-	if ((input = fopen (file, "r")) == NULL)
+	FILE *input = fopen(file, "r");
+	if (input == NULL)
 		return false;
 	else
 	{
@@ -1973,41 +1920,6 @@ const char* ServerConfig::CleanFilename(const char* name)
 }
 
 
-std::string ServerConfig::GetFullProgDir()
-{
-	char buffer[PATH_MAX];
-#ifdef WINDOWS
-	/* Windows has specific api calls to get the exe path that never fail.
-	 * For once, windows has something of use, compared to the POSIX code
-	 * for this, this is positively neato.
-	 */
-	if (GetModuleFileName(NULL, buffer, MAX_PATH))
-	{
-		std::string fullpath = buffer;
-		std::string::size_type n = fullpath.rfind("\\inspircd.exe");
-		return std::string(fullpath, 0, n);
-	}
-#else
-	// Get the current working directory
-	if (getcwd(buffer, PATH_MAX))
-	{
-		std::string remainder = this->argv[0];
-
-		/* Does argv[0] start with /? its a full path, use it */
-		if (remainder[0] == '/')
-		{
-			std::string::size_type n = remainder.rfind("/inspircd");
-			return std::string(remainder, 0, n);
-		}
-
-		std::string fullpath = std::string(buffer) + "/" + remainder;
-		std::string::size_type n = fullpath.rfind("/inspircd");
-		return std::string(fullpath, 0, n);
-	}
-#endif
-	return "/";
-}
-
 std::string ServerConfig::GetSID()
 {
 	return sid;