Partially revert "Quote paths in the makefile".

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

diff --git a/src/inspstring.cpp b/src/inspstring.cpp
index 74629bf5561de7c5945466d2e7f88c1332b05a90..534b7ce008558a32ac466eaa786ea1f6c1194560 100644 (file)
--- a/src/inspstring.cpp
+++ b/src/inspstring.cpp
@@ -1,17 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
-/* $Core */
 
 #include "inspircd.h"
 
@@ -190,7 +196,7 @@ std::string BinToBase64(const std::string& data_str, const char* table, char pad
        }
        else if (data_str.length() == i + 2)
        {
-               buffer = (data[i] << 16 | data[i] << 8);
+               buffer = (data[i] << 16 | data[i+1] << 8);
                rv.push_back(table[0x3F & (buffer >> 18)]);
                rv.push_back(table[0x3F & (buffer >> 12)]);
                rv.push_back(table[0x3F & (buffer >>  6)]);
@@ -205,16 +211,16 @@ std::string Base64ToBin(const std::string& data_str, const char* table)
        if (!table)
                table = b64table;
 
-       bool ok = true;
        int bitcount = 0;
-       uint32_t buffer;
+       uint32_t buffer = 0;
        const char* data = data_str.c_str();
        std::string rv;
-       while (ok)
+       while (true)
        {
-               const char* find = strchr(table, *data);
-               ok = (find && find < table + 64);
-               buffer = (buffer << 6) | (ok ? find - table : 0);
+               const char* find = strchr(table, *data++);
+               if (!find || find >= table + 64)
+                       break;
+               buffer = (buffer << 6) | (find - table);
                bitcount += 6;
                if (bitcount >= 8)
                {