X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/08d11e34cc17e3045231729d87025a0cfa598f54..3c6fb31a4bb6580e3295fdec5d4687eafb487251:/modules/m_testmask.c?ds=sidebyside

diff --git a/modules/m_testmask.c b/modules/m_testmask.c
index 97f7889..304afab 100644
--- a/modules/m_testmask.c
+++ b/modules/m_testmask.c
@@ -1,6 +1,6 @@
 /*
  *  m_testmask.c: Shows the number of matching local and global clients
- *                for a user@host mask, helpful when setting GLINE's
+ *                for a user@host mask
  *
  *  Copyright (C) 2003 by W. Campbell
  *  Coypright (C) 2004 ircd-ratbox development team
@@ -38,10 +38,10 @@
 #include "client.h"
 #include "common.h"     /* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
@@ -71,7 +71,7 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
 	int gcount = 0;
 	char *name, *username, *hostname;
 	const char *sockhost;
-	char *gecos = NULL, *mangle_gecos = NULL;
+	char *gecos = NULL;
 	rb_dlink_node *ptr;
 
 	name = LOCAL_COPY(parv[1]);
@@ -105,38 +105,6 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
 	{
 		gecos = LOCAL_COPY(parv[2]);
 		collapse_esc(gecos);
-		if(strstr(gecos, "\\s"))
-		{
-			char *tmp = LOCAL_COPY(gecos);
-			char *orig = tmp;
-			char *new = tmp; 
-			while(*orig)
-			{
-				if(*orig == '\\' && *(orig + 1) != '\0')
-				{
-					if(*(orig + 1) == 's')
-					{
-						*new++ = ' ';
-						orig += 2;   
-					}
-					/* otherwise skip that and the escaped
-					 * character after it, so we dont mistake
-					 * \\s as \s --fl
-					 */
-					else
-					{   
-						*new++ = *orig++;
-						*new++ = *orig++;
-					}
-				}
-				else
-					*new++ = *orig++;
-			}
-
-			*new = '\0';
-			mangle_gecos = LOCAL_COPY(tmp);
-		} else
-			mangle_gecos = gecos;
 	}
 
 	RB_DLINK_FOREACH(ptr, global_client_list.head)
@@ -161,7 +129,7 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
 			if(name && !match(name, target_p->name))
 				continue;
 
-			if(mangle_gecos && !match_esc(mangle_gecos, target_p->info))
+			if(gecos && !match_esc(gecos, target_p->info))
 				continue;
 
 			if(MyClient(target_p))