summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6408757)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8576
e03df62e-2008-0410-955e-
edbf42e46eb7
bool Downloading();
void StartDownloads();
bool Downloading();
void StartDownloads();
+
+ void Complete(const std::string &filename, bool error);
/** This holds all the information in the config file,
* it's indexed by tag name to a vector of key/values.
/** This holds all the information in the config file,
* it's indexed by tag name to a vector of key/values.
{
for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
{
{
for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
{
+ /* Skip over modules that are aleready loaded for some reason */
+ if (ServerInstance->Modules->Find(*adding))
+ continue;
+
if (bail)
printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n", adding->c_str());
if (bail)
printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n", adding->c_str());
return (TotalDownloaded < IncludedFiles.size());
}
return (TotalDownloaded < IncludedFiles.size());
}
+void ServerConfig::Complete(const std::string &filename, bool error)
+{
+ std::map<std::string, std::istream*>::iterator x = IncludedFiles.find(filename);
+
+ if (x != IncludedFiles.end())
+ {
+ TotalDownloaded++;
+ if (error)
+ {
+ delete x->second;
+ x->second = NULL;
+ FileErrors++;
+ }
+ }
+
+ return;
+}
+
void ServerConfig::StartDownloads()
{
if (isatty(0) && isatty(1) && isatty(2))
void ServerConfig::StartDownloads()
{
if (isatty(0) && isatty(1) && isatty(2))