X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=e5d8d379c42e798e0996128e66763bfbf2a857b0;hb=4ab1c43c1eee708fc50a4808f714a731891b75e8;hp=b4d7cd7c6c670d37f2f00e0ec35e1edf00961ac2;hpb=63732f37cba3d493954154c0f2440ddc88d7f207;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index b4d7cd7c6..e5d8d379c 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -1,25 +1,36 @@
-/*       +------------------------------------+
- *       | 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>
+ *   Copyright (C) 2006-2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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/>.
  */
 
+
 /* Stop mysql wanting to use long long */
 #define NO_CLIENT_LONG_LONG
 
 #include "inspircd.h"
 #include <mysql.h>
-#include "sql.h"
+#include "modules/sql.h"
 
-#ifdef WINDOWS
-#pragma comment(lib, "mysqlclient.lib")
+#ifdef _WIN32
+# pragma comment(lib, "mysqlclient.lib")
+# pragma comment(lib, "advapi32.lib")
+# pragma comment(linker, "/NODEFAULTLIB:LIBCMT")
 #endif
 
 /* VERSION 3 API: With nonblocking (threaded) requests */
@@ -27,7 +38,6 @@
 /* $ModDesc: SQL Service Provider module for all other m_sql* modules */
 /* $CompileFlags: exec("mysql_config --include") */
 /* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */
-/* $ModDep: m_sqlv2.h */
 
 /* THE NONBLOCKING MYSQL API!
  *
@@ -97,11 +107,11 @@ class ModuleSQL : public Module
 	ConnMap connections; // main thread only
 
 	ModuleSQL();
-	void init();
+	void init() CXX11_OVERRIDE;
 	~ModuleSQL();
-	void OnRehash(User* user);
-	void OnUnloadModule(Module* mod);
-	Version GetVersion();
+	void OnRehash(User* user) CXX11_OVERRIDE;
+	void OnUnloadModule(Module* mod) CXX11_OVERRIDE;
+	Version GetVersion() CXX11_OVERRIDE;
 };
 
 class DispatcherThread : public SocketThread
@@ -111,8 +121,8 @@ class DispatcherThread : public SocketThread
  public:
 	DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { }
 	~DispatcherThread() { }
-	virtual void Run();
-	virtual void OnNotify();
+	void Run();
+	void OnNotify();
 };
 
 #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224
@@ -179,21 +189,17 @@ class MySQLresult : public SQLResult
 
 	}
 
-	~MySQLresult()
-	{
-	}
-
-	virtual int Rows()
+	int Rows()
 	{
 		return rows;
 	}
 
-	virtual void GetCols(std::vector<std::string>& result)
+	void GetCols(std::vector<std::string>& result)
 	{
 		result.assign(colnames.begin(), colnames.end());
 	}
 
-	virtual SQLEntry GetValue(int row, int column)
+	SQLEntry GetValue(int row, int column)
 	{
 		if ((row >= 0) && (row < rows) && (column >= 0) && (column < (int)fieldlists[row].size()))
 		{
@@ -202,7 +208,7 @@ class MySQLresult : public SQLResult
 		return SQLEntry();
 	}
 
-	virtual bool GetRow(SQLEntries& result)
+	bool GetRow(SQLEntries& result)
 	{
 		if (currentrow < rows)
 		{
@@ -229,7 +235,7 @@ class SQLConnection : public SQLProvider
 
 	// This constructor creates an SQLConnection object with the given credentials, but does not connect yet.
 	SQLConnection(Module* p, ConfigTag* tag) : SQLProvider(p, "SQL/" + tag->getString("id")),
-		config(tag)
+		config(tag), connection(NULL)
 	{
 	}
 
@@ -281,18 +287,16 @@ class SQLConnection : public SQLProvider
 		{
 			/* XXX: See /usr/include/mysql/mysqld_error.h for a list of
 			 * possible error numbers and error messages */
-			SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + std::string(": ") + mysql_error(connection));
+			SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + ": " + mysql_error(connection));
 			return new MySQLresult(e);
 		}
 	}
 
 	bool CheckConnection()
 	{
-		if (mysql_ping(connection) != 0)
-		{
+		if (!connection || mysql_ping(connection) != 0)
 			return Connect();
-		}
-		else return true;
+		return true;
 	}
 
 	std::string GetError()
@@ -346,7 +350,7 @@ class SQLConnection : public SQLProvider
 			{
 				std::string field;
 				i++;
-				while (i < q.length() && isalpha(q[i]))
+				while (i < q.length() && isalnum(q[i]))
 					field.push_back(q[i++]);
 				i--;
 
@@ -375,7 +379,7 @@ void ModuleSQL::init()
 	ServerInstance->Threads->Start(Dispatcher);
 
 	Implementation eventlist[] = { I_OnRehash, I_OnUnloadModule };
-	ServerInstance->Modules->Attach(eventlist, this, 2);
+	ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 	OnRehash(NULL);
 }
@@ -447,8 +451,10 @@ void ModuleSQL::OnUnloadModule(Module* mod)
 {
 	SQLerror err(SQL_BAD_DBID);
 	Dispatcher->LockQueue();
-	for(unsigned int i = qq.size() - 1; i >= 0; i--)
+	unsigned int i = qq.size();
+	while (i > 0)
 	{
+		i--;
 		if (qq[i].q->creator == mod)
 		{
 			if (i == 0)
@@ -493,7 +499,7 @@ void DispatcherThread::Run()
 			 */
 
 			this->LockQueue();
-			if (Parent->qq.front().q == i.q)
+			if (!Parent->qq.empty() && Parent->qq.front().q == i.q)
 			{
 				Parent->qq.pop_front();
 				Parent->rq.push_back(RQueueItem(i.q, res));