#include <fstream>
#include "configparser.h"
+enum ParseFlags
+{
+ // Legacy config parsing should be used.
+ FLAG_USE_COMPAT = 1,
+
+ // Executable includes are disabled.
+ FLAG_NO_EXEC = 2,
+
+ // All includes are disabled.
+ FLAG_NO_INC = 4
+};
+
+// Represents the position within a config file.
+struct FilePosition
+{
+ // The name of the file which is being read.
+ std::string name;
+
+ // The line of the file that this position points to.
+ unsigned int line;
+
+ // The column of the file that this position points to.
+ unsigned int column;
+
+ FilePosition(const std::string& Name)
+ : name(Name)
+ , line(1)
+ , column(1)
+ {
+ }
+
+ /** Returns a string that represents this file position. */
+ std::string str()
+ {
+ return name + ":" + ConvToStr(line) + ":" + ConvToStr(column);
+ }
+};
+
+// RAII wrapper for FILE* which closes the file when it goes out of scope.
+class FileWrapper
+{
+ private:
+ // Whether this file handle should be closed with pclose.
+ bool close_with_pclose;
+
+ // The file handle which is being wrapped.
+ FILE* const file;
+
+ public:
+ FileWrapper(FILE* File, bool CloseWithPClose = false)
+ : close_with_pclose(CloseWithPClose)
+ , file(File)
+ {
+ }
+
+ // Operator which determines whether the file is open.
+ operator bool() { return (file != NULL); }
+
+ // Operator which retrieves the underlying FILE pointer.
+ operator FILE*() { return file; }
+
+ ~FileWrapper()
+ {
+ if (!file)
+ return;
+
+ if (close_with_pclose)
+ pclose(file);
+ else
+ fclose(file);
+ }
+};
+
+
struct Parser
{
ParseStack& stack;
int flags;
FILE* const file;
- fpos current;
- fpos last_tag;
+ FilePosition current;
+ FilePosition last_tag;
reference<ConfigTag> tag;
int ungot;
std::string mandatory_tag;
else if (ch == '\n')
{
current.line++;
- current.col = 0;
+ current.column = 0;
}
else
{
- current.col++;
+ current.column++;
}
return ch;
}
throw CoreException("Empty tag name");
ConfigItems* items;
- tag = ConfigTag::create(name, current.filename, current.line, items);
+ tag = ConfigTag::create(name, current.name, current.line, items);
while (kv(items))
{
break;
case 0xFE:
case 0xFF:
- stack.errstr << "Do not save your files as UTF-16; use ASCII!\n";
+ stack.errstr << "Do not save your files as UTF-16 or UTF-32, use UTF-8!\n";
+ /*@fallthrough@*/
default:
throw CoreException("Syntax error - start of tag expected");
}
flags |= FLAG_NO_INC;
if (tag->getBool("noexec", false))
flags |= FLAG_NO_EXEC;
+
if (!ParseFile(ServerInstance->Config->Paths.PrependConfig(name), flags, mandatorytag))
throw CoreException("Included");
}
+ else if (tag->readString("directory", name))
+ {
+ if (tag->getBool("noinclude", false))
+ flags |= FLAG_NO_INC;
+ if (tag->getBool("noexec", false))
+ flags |= FLAG_NO_EXEC;
+
+ const std::string includedir = ServerInstance->Config->Paths.PrependConfig(name);
+ std::vector<std::string> files;
+ if (!FileSystem::GetFileList(includedir, files, "*.conf"))
+ throw CoreException("Unable to read directory for include: " + includedir);
+
+ std::sort(files.begin(), files.end());
+ for (std::vector<std::string>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
+ {
+ const std::string path = includedir + '/' + *iter;
+ if (!ParseFile(path, flags, mandatorytag))
+ throw CoreException("Included");
+ }
+ }
else if (tag->readString("executable", name))
{
if (flags & FLAG_NO_EXEC)
flags |= FLAG_NO_INC;
if (tag->getBool("noexec", true))
flags |= FLAG_NO_EXEC;
+
if (!ParseFile(name, flags, mandatorytag, true))
throw CoreException("Included");
}
if (!readString(key, duration))
return def;
- unsigned long ret = InspIRCd::Duration(duration);
+ unsigned long ret;
+ if (!InspIRCd::Duration(duration, ret))
+ {
+ ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Value of <" + tag + ":" + key + "> at " + getTagLocation() +
+ " is not a duration; value set to " + ConvToStr(def) + ".");
+ return def;
+ }
+
CheckRange(tag, key, ret, def, min, max);
return ret;
}