summaryrefslogtreecommitdiff
path: root/src/inspircd_io.cpp
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-08 18:04:59 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-08 18:04:59 +0000
commite4209b90f96340b0b7cb703aeca5975b0c42dc55 (patch)
treea62060315f14ed3185433899f3793c5d0e2c1ca3 /src/inspircd_io.cpp
parent630d1eed7842d3f47505407b98f5a7df8878e49e (diff)
Fixed bug #85
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2273 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/inspircd_io.cpp')
-rw-r--r--src/inspircd_io.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 4d2369d23..8c870af0f 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -331,9 +331,11 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream
{
while (!feof(conf))
{
+ *buffer = 0;
if (fgets_safe(buffer, MAXBUF, conf))
{
- if ((!feof(conf)) && (buffer) && (strlen(buffer)))
+ /*if ((!feof(conf)) && (buffer) && (strlen(buffer)))*/
+ if ((buffer) && (strlen(buffer)) && (*buffer > '\r'))
{
if ((buffer[0] != '#') && (buffer[0] != '\r') && (buffer[0] != '\n'))
{
@@ -396,16 +398,6 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream
}
}
}
- if (*buffer)
- {
- bool error = false;
- std::string data = ConfProcess(buffer,linenumber++,errorstream,error,filename);
- if (error)
- {
- return false;
- }
- *target << data;
- }
fclose(conf);
}
target->seekg(0);