m_callerid Remove redundant includes

[user/henk/code/inspircd.git] / src / configparser.cpp

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 2e84b1736f5aba2fa5aff7c6cbaa2edcb75997c1..a8e36f6e0048c1c1c2a91a719ee81d575dcccbcb 100644 (file)
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include <fstream>
 #include "configparser.h"
@@ -311,9 +317,13 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
        char linebuf[MAXBUF*10];
        while (fgets(linebuf, sizeof(linebuf), file))
        {
-               int len = strlen(linebuf);
+               size_t len = strlen(linebuf);
                if (len)
-                       cache.push_back(std::string(linebuf, len - 1));
+               {
+                       if (linebuf[len-1] == '\n')
+                               len--;
+                       cache.push_back(std::string(linebuf, len));
+               }
        }
 }