diff options
| -rw-r--r-- | src/inspircd_io.cpp | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp index 754a25284..e28290ec5 100644 --- a/src/inspircd_io.cpp +++ b/src/inspircd_io.cpp @@ -311,13 +311,38 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream { if ((buffer[0] != '#') && (buffer[0] != '\r') && (buffer[0] != '\n')) { - bool error = false; - std::string data = ConfProcess(buffer,linenumber++,errorstream,error,filename); - if (error) + if (!strncmp(buffer,"<include file=\"",15)) { - return false; + char* buf = buffer; + // include file directive + buf += 15; // advance to filename + for (int j = 0; j < strlen(buffer); j++) + { + if (buf[j] == '"') + { + buf[j] = '\0'; + break; + } + } + log(DEFAULT,"Opening included file '%s'",buf); + std::stringstream merge(stringstream::in | stringstream::out); + // recursively call LoadConf and get the new data, use the same errorstream + LoadConf(buf, &merge, errorstream); + // append &merge to the end of the file + std::string newstuff = merge.str(); + // append the new stuff to the end of the line + *target << newstuff; + } + else + { + bool error = false; + std::string data = ConfProcess(buffer,linenumber++,errorstream,error,filename); + if (error) + { + return false; + } + *target << data; } - *target << data; } else linenumber++; } |