irc_string.h -> match.h, irc_string.h; includes changed

extensions/m_adminwall.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"

extensions/m_findforwards.c

@@ -23,7 +23,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

extensions/m_identify.c

@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "logger.h"

extensions/m_mkpasswd.c

@@ -14,7 +14,7 @@
 #include "client.h"
 #include "common.h"		/* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_newconf.h"
 #include "s_conf.h"

extensions/m_ojoin.c

@@ -30,7 +30,7 @@
 #include "s_newconf.h" 
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h" 
 #include "msg.h"
 #include "parse.h"

extensions/m_okick.c

@@ -26,7 +26,7 @@
 #include "stdinc.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

extensions/m_olist.c

@@ -35,7 +35,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"

extensions/m_omode.c

@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

extensions/m_opme.c

@@ -27,7 +27,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"

extensions/m_webirc.c

@@ -42,7 +42,7 @@
 
 #include "stdinc.h"
 #include "client.h"		/* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "hostmask.h"
 #include "send.h"		/* sendto_one */
 #include "numeric.h"		/* ERR_xxx */

include/client.h

@@ -38,7 +38,7 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 
 /* other structs */

include/irc_string.h

@@ -27,122 +27,10 @@
 #ifndef INCLUDED_irc_string_h
 #define INCLUDED_irc_string_h
 
-#include "setup.h"
-#include "ircd_defs.h"
-
-/*
- * match - compare name with mask, mask may contain * and ? as wildcards
- * match - returns 1 on successful match, 0 otherwise
- *
- * mask_match - compare one mask to another
- * match_esc - compare with support for escaping chars
- * match_cidr - compares u!h@addr with u!h@addr/cidr
- * match_ips - compares addr with addr/cidr in ascii form
- */
-extern int match(const char *mask, const char *name);
-extern int mask_match(const char *oldmask, const char *newmask);
-extern int match_esc(const char *mask, const char *name);
-extern int match_cidr(const char *mask, const char *name);
-extern int match_ips(const char *mask, const char *name);
-
-/*
- * comp_with_mask - compares to IP address
- */
-int comp_with_mask(void *addr, void *dest, u_int mask);
-int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask);
-
-/*
- * collapse - collapse a string in place, converts multiple adjacent *'s 
- * into a single *.
- * collapse - modifies the contents of pattern 
- *
- * collapse_esc() - collapse with support for escaping chars
- */
-extern char *collapse(char *pattern);
-extern char *collapse_esc(char *pattern);
-
-/*
- * irccmp - case insensitive comparison of s1 and s2
- */
-extern int irccmp(const char *s1, const char *s2);
-/*
- * ircncmp - counted case insensitive comparison of s1 and s2
- */
-extern int ircncmp(const char *s1, const char *s2, int n);
-/*
-** canonize - reduce a string of duplicate list entries to contain
-** only the unique items.
-*/
-#ifdef NO_DUPE_MULTI_MESSAGES
-extern char *canonize(char *);
-#endif
-
 /*
  * strip_colour - remove colour codes from a string
  * -asuffield (?)
  */
 char *strip_colour(char *string);
 
-#define EmptyString(x) ((x) == NULL || *(x) == '\0')
-#define CheckEmpty(x) EmptyString(x) ? "" : x
-
-/*
- * character macros
- */
-extern const unsigned char ToLowerTab[];
-#define ToLower(c) (ToLowerTab[(unsigned char)(c)])
-
-extern const unsigned char ToUpperTab[];
-#define ToUpper(c) (ToUpperTab[(unsigned char)(c)])
-
-extern const unsigned int CharAttrs[];
-
-#define PRINT_C   0x001
-#define CNTRL_C   0x002
-#define ALPHA_C   0x004
-#define PUNCT_C   0x008
-#define DIGIT_C   0x010
-#define SPACE_C   0x020
-#define NICK_C    0x040
-#define CHAN_C    0x080
-#define KWILD_C   0x100
-#define CHANPFX_C 0x200
-#define USER_C    0x400
-#define HOST_C    0x800
-#define NONEOS_C 0x1000
-#define SERV_C   0x2000
-#define EOL_C    0x4000
-#define MWILD_C  0x8000
-#define LET_C   0x10000 /* an actual letter */
-#define FCHAN_C 0x20000 /* a 'fake' channel char */
-
-#define IsHostChar(c)   (CharAttrs[(unsigned char)(c)] & HOST_C)
-#define IsUserChar(c)   (CharAttrs[(unsigned char)(c)] & USER_C)
-#define IsChanPrefix(c) (CharAttrs[(unsigned char)(c)] & CHANPFX_C)
-#define IsChanChar(c)   (CharAttrs[(unsigned char)(c)] & CHAN_C)
-#define IsFakeChanChar(c)	(CharAttrs[(unsigned char)(c)] & FCHAN_C)
-#define IsKWildChar(c)  (CharAttrs[(unsigned char)(c)] & KWILD_C)
-#define IsMWildChar(c)  (CharAttrs[(unsigned char)(c)] & MWILD_C)
-#define IsNickChar(c)   (CharAttrs[(unsigned char)(c)] & NICK_C)
-#define IsServChar(c)   (CharAttrs[(unsigned char)(c)] & (NICK_C | SERV_C))
-#define IsIdChar(c)	(CharAttrs[(unsigned char)(c)] & (DIGIT_C | LET_C))
-#define IsLetter(c)	(CharAttrs[(unsigned char)(c)] & LET_C)
-#define IsCntrl(c)      (CharAttrs[(unsigned char)(c)] & CNTRL_C)
-#define IsAlpha(c)      (CharAttrs[(unsigned char)(c)] & ALPHA_C)
-#define IsSpace(c)      (CharAttrs[(unsigned char)(c)] & SPACE_C)
-#define IsLower(c)      (IsAlpha((c)) && ((unsigned char)(c) > 0x5f))
-#define IsUpper(c)      (IsAlpha((c)) && ((unsigned char)(c) < 0x60))
-#define IsDigit(c)      (CharAttrs[(unsigned char)(c)] & DIGIT_C)
-#define IsXDigit(c) (IsDigit(c) || ('a' <= (c) && (c) <= 'f') || \
-        ('A' <= (c) && (c) <= 'F'))
-#define IsAlNum(c) (CharAttrs[(unsigned char)(c)] & (DIGIT_C | ALPHA_C))
-#define IsPrint(c) (CharAttrs[(unsigned char)(c)] & PRINT_C)
-#define IsAscii(c) ((unsigned char)(c) < 0x80)
-#define IsGraph(c) (IsPrint((c)) && ((unsigned char)(c) != 0x32))
-#define IsPunct(c) (!(CharAttrs[(unsigned char)(c)] & \
-                                           (CNTRL_C | ALPHA_C | DIGIT_C)))
-
-#define IsNonEOS(c) (CharAttrs[(unsigned char)(c)] & NONEOS_C)
-#define IsEol(c) (CharAttrs[(unsigned char)(c)] & EOL_C)
-
 #endif /* INCLUDED_irc_string_h */

include/match.h

@@ -0,0 +1,142 @@
+/*
+ *  ircd-ratbox: A slightly useful ircd.
+ *  irc_string.h: A header for the ircd string functions.
+ *
+ *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
+ *  Copyright (C) 1996-2002 Hybrid Development Team
+ *  Copyright (C) 2002-2004 ircd-ratbox development team
+ *
+ *  This program 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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  USA
+ *
+ *  $Id: irc_string.h 3538 2007-07-26 14:21:57Z jilles $
+ */
+
+#ifndef INCLUDED_match_h
+#define INCLUDED_match_h
+
+#include "setup.h"
+#include "ircd_defs.h"
+
+/*
+ * match - compare name with mask, mask may contain * and ? as wildcards
+ * match - returns 1 on successful match, 0 otherwise
+ *
+ * mask_match - compare one mask to another
+ * match_esc - compare with support for escaping chars
+ * match_cidr - compares u!h@addr with u!h@addr/cidr
+ * match_ips - compares addr with addr/cidr in ascii form
+ */
+extern int match(const char *mask, const char *name);
+extern int mask_match(const char *oldmask, const char *newmask);
+extern int match_esc(const char *mask, const char *name);
+extern int match_cidr(const char *mask, const char *name);
+extern int match_ips(const char *mask, const char *name);
+
+/*
+ * comp_with_mask - compares to IP address
+ */
+int comp_with_mask(void *addr, void *dest, u_int mask);
+int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask);
+
+/*
+ * collapse - collapse a string in place, converts multiple adjacent *'s 
+ * into a single *.
+ * collapse - modifies the contents of pattern 
+ *
+ * collapse_esc() - collapse with support for escaping chars
+ */
+extern char *collapse(char *pattern);
+extern char *collapse_esc(char *pattern);
+
+/*
+ * irccmp - case insensitive comparison of s1 and s2
+ */
+extern int irccmp(const char *s1, const char *s2);
+/*
+ * ircncmp - counted case insensitive comparison of s1 and s2
+ */
+extern int ircncmp(const char *s1, const char *s2, int n);
+/*
+** canonize - reduce a string of duplicate list entries to contain
+** only the unique items.
+*/
+#ifdef NO_DUPE_MULTI_MESSAGES
+extern char *canonize(char *);
+#endif
+
+#define EmptyString(x) ((x) == NULL || *(x) == '\0')
+#define CheckEmpty(x) EmptyString(x) ? "" : x
+
+/*
+ * character macros
+ */
+extern const unsigned char ToLowerTab[];
+#define ToLower(c) (ToLowerTab[(unsigned char)(c)])
+
+extern const unsigned char ToUpperTab[];
+#define ToUpper(c) (ToUpperTab[(unsigned char)(c)])
+
+extern const unsigned int CharAttrs[];
+
+#define PRINT_C   0x001
+#define CNTRL_C   0x002
+#define ALPHA_C   0x004
+#define PUNCT_C   0x008
+#define DIGIT_C   0x010
+#define SPACE_C   0x020
+#define NICK_C    0x040
+#define CHAN_C    0x080
+#define KWILD_C   0x100
+#define CHANPFX_C 0x200
+#define USER_C    0x400
+#define HOST_C    0x800
+#define NONEOS_C 0x1000
+#define SERV_C   0x2000
+#define EOL_C    0x4000
+#define MWILD_C  0x8000
+#define LET_C   0x10000 /* an actual letter */
+#define FCHAN_C 0x20000 /* a 'fake' channel char */
+
+#define IsHostChar(c)   (CharAttrs[(unsigned char)(c)] & HOST_C)
+#define IsUserChar(c)   (CharAttrs[(unsigned char)(c)] & USER_C)
+#define IsChanPrefix(c) (CharAttrs[(unsigned char)(c)] & CHANPFX_C)
+#define IsChanChar(c)   (CharAttrs[(unsigned char)(c)] & CHAN_C)
+#define IsFakeChanChar(c)	(CharAttrs[(unsigned char)(c)] & FCHAN_C)
+#define IsKWildChar(c)  (CharAttrs[(unsigned char)(c)] & KWILD_C)
+#define IsMWildChar(c)  (CharAttrs[(unsigned char)(c)] & MWILD_C)
+#define IsNickChar(c)   (CharAttrs[(unsigned char)(c)] & NICK_C)
+#define IsServChar(c)   (CharAttrs[(unsigned char)(c)] & (NICK_C | SERV_C))
+#define IsIdChar(c)	(CharAttrs[(unsigned char)(c)] & (DIGIT_C | LET_C))
+#define IsLetter(c)	(CharAttrs[(unsigned char)(c)] & LET_C)
+#define IsCntrl(c)      (CharAttrs[(unsigned char)(c)] & CNTRL_C)
+#define IsAlpha(c)      (CharAttrs[(unsigned char)(c)] & ALPHA_C)
+#define IsSpace(c)      (CharAttrs[(unsigned char)(c)] & SPACE_C)
+#define IsLower(c)      (IsAlpha((c)) && ((unsigned char)(c) > 0x5f))
+#define IsUpper(c)      (IsAlpha((c)) && ((unsigned char)(c) < 0x60))
+#define IsDigit(c)      (CharAttrs[(unsigned char)(c)] & DIGIT_C)
+#define IsXDigit(c) (IsDigit(c) || ('a' <= (c) && (c) <= 'f') || \
+        ('A' <= (c) && (c) <= 'F'))
+#define IsAlNum(c) (CharAttrs[(unsigned char)(c)] & (DIGIT_C | ALPHA_C))
+#define IsPrint(c) (CharAttrs[(unsigned char)(c)] & PRINT_C)
+#define IsAscii(c) ((unsigned char)(c) < 0x80)
+#define IsGraph(c) (IsPrint((c)) && ((unsigned char)(c) != 0x32))
+#define IsPunct(c) (!(CharAttrs[(unsigned char)(c)] & \
+                                           (CNTRL_C | ALPHA_C | DIGIT_C)))
+
+#define IsNonEOS(c) (CharAttrs[(unsigned char)(c)] & NONEOS_C)
+#define IsEol(c) (CharAttrs[(unsigned char)(c)] & EOL_C)
+
+#endif /* INCLUDED_match_h */

include/res.h

@@ -10,7 +10,7 @@
 #include "ircd_defs.h"
 #include "common.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 
 /* Maximum number of nameservers in /etc/resolv.conf we care about 

modules/core/m_die.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "logger.h"
 #include "s_conf.h"

modules/core/m_join.c

@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/core/m_kick.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/core/m_kill.c

@@ -34,7 +34,7 @@
 #include "s_conf.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"

modules/core/m_message.c

@@ -35,7 +35,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "channel.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "class.h"
 #include "msg.h"
@@ -43,6 +43,7 @@
 #include "send.h"
 #include "s_newconf.h"
 #include "s_stats.h"
+#include "irc_string.h"
 
 static int m_message(int, const char *, struct Client *, struct Client *, int, const char **);
 static int m_privmsg(struct Client *, struct Client *, int, const char **);

modules/core/m_mode.c

@@ -28,7 +28,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

modules/core/m_nick.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

modules/core/m_part.c

@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -39,6 +39,7 @@
 #include "modules.h"
 #include "s_conf.h"
 #include "packet.h"
+#include "irc_string.h"
 
 static int m_part(struct Client *, struct Client *, int, const char **);
 

modules/core/m_quit.c

@@ -34,6 +34,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
+#include "irc_string.h"
 
 static int m_quit(struct Client *, struct Client *, int, const char **);
 static int ms_quit(struct Client *, struct Client *, int, const char **);

modules/core/m_server.c

@@ -28,7 +28,7 @@
 #include "client.h"		/* client struct */
 #include "common.h"		/* TRUE bleah */
 #include "hash.h"		/* add_to_client_hash */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"		/* me */
 #include "numeric.h"		/* ERR_xxx */
 #include "s_conf.h"		/* struct ConfItem */

modules/core/m_squit.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"		/* FALSE bleah */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

modules/m_away.c

@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_cap.c

@@ -33,7 +33,7 @@
 #include "stdinc.h"
 #include "class.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "msg.h"

modules/m_capab.c

@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "msg.h"

modules/m_challenge.c

@@ -44,7 +44,7 @@
 #include "s_conf.h"
 #include "msg.h"
 #include "parse.h"
-#include "irc_string.h"
+#include "match.h"
 #include "logger.h"
 #include "s_user.h"
 #include "cache.h"

modules/m_connect.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"

modules/m_dline.c

@@ -29,7 +29,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"

modules/m_etrace.c

@@ -39,7 +39,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

modules/m_info.c

@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hook.h"
 #include "numeric.h"

modules/m_invite.c

@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_ison.c

@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_kline.c

@@ -29,7 +29,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"

modules/m_knock.c

@@ -27,7 +27,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_links.c

@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

modules/m_list.c

@@ -37,7 +37,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

modules/m_locops.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"

modules/m_names.c

@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_oper.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

modules/m_pass.c

@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"		/* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "send.h"		/* sendto_one */
 #include "numeric.h"		/* ERR_xxx */
 #include "ircd.h"		/* me */

modules/m_ping.c

@@ -29,7 +29,7 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"

modules/m_pong.c

@@ -34,7 +34,7 @@
 #include "s_conf.h"
 #include "send.h"
 #include "channel.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "hash.h"

modules/m_rehash.c

@@ -28,7 +28,7 @@
 #include "client.h"
 #include "channel.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "s_serv.h"
 #include "numeric.h"

modules/m_restart.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

modules/m_scan.c

@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

modules/m_set.c

@@ -28,7 +28,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

modules/m_signon.c

@@ -48,7 +48,7 @@
 #include "monitor.h"
 #include "s_stats.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_user.h"
 
 static int me_svslogin(struct Client *, struct Client *, int, const char **);

modules/m_snote.c

@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

modules/m_stats.c

@@ -28,7 +28,7 @@
 #include "class.h"		/* report_classes */
 #include "client.h"		/* Client */
 #include "common.h"		/* TRUE/FALSE */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"		/* me */
 #include "listener.h"		/* show_ports */
 #include "msg.h"		/* Message */

modules/m_svinfo.c

@@ -26,7 +26,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"		/* TRUE bleah */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_tb.c

@@ -37,7 +37,7 @@
 #include "common.h"
 #include "config.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "msg.h"
 #include "modules.h"

modules/m_testmask.c

@@ -38,7 +38,7 @@
 #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 "logger.h"

modules/m_topic.c

@@ -28,7 +28,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

modules/m_trace.c

@@ -31,7 +31,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

modules/m_user.c

@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

modules/m_userhost.c

@@ -30,7 +30,7 @@
 #include "numeric.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"

modules/m_wallops.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"

modules/m_who.c

@@ -32,7 +32,7 @@
 #include "numeric.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"

modules/m_whois.c

@@ -35,7 +35,7 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"

modules/m_whowas.c

@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

modules/m_xline.c

@@ -42,7 +42,7 @@
 #include "logger.h"
 #include "s_serv.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"

src/channel.c

@@ -30,7 +30,7 @@
 #include "common.h"
 #include "hash.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"		/* captab */

src/chmode.c

@@ -31,7 +31,7 @@
 #include "common.h"
 #include "hash.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"		/* captab */

src/class.c

@@ -35,7 +35,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #define BAD_CONF_CLASS          -1
 #define BAD_PING                -2

src/client.c

@@ -31,7 +31,7 @@
 #include "class.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"

src/hash.c

@@ -31,7 +31,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

src/hook.c

@@ -38,7 +38,7 @@
  */
 #include "stdinc.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 
 hook *hooks;
 

src/hostmask.c

@@ -31,7 +31,7 @@
 #include "hostmask.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #ifdef RB_IPV6
 static unsigned long hash_ipv6(struct sockaddr *, int);

src/irc_dictionary.c

@@ -23,7 +23,7 @@
  */
 
 #include "stdinc.h"
-#include "irc_string.h"
+#include "match.h"
 #include "client.h"
 #include "setup.h"
 #include "irc_dictionary.h"

src/irc_string.c

@@ -24,10 +24,7 @@
  *  $Id: irc_string.c 678 2006-02-03 20:25:01Z jilles $
  */
 
-#include "stdinc.h"
 #include "irc_string.h"
-#include "client.h"
-#include "setup.h"
 
 char *
 strip_colour(char *string)

src/ircd.c

@@ -34,7 +34,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd_signal.h"
 #include "msg.h"		/* msgtab */
 #include "hostmask.h"

src/kdparse.c

@@ -30,7 +30,7 @@
 #include "s_newconf.h"
 #include "hostmask.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 
 /* conf_add_fields()

src/listener.c

@@ -28,7 +28,7 @@
 #include "setup.h"
 #include "listener.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

src/match.c

@@ -23,7 +23,7 @@
 #include "config.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 
 /*
  * Compare if a given string (name) matches the given

src/modules.c

@@ -37,7 +37,7 @@
 #include "numeric.h"
 #include "parse.h"
 #include "ircd_defs.h"
-#include "irc_string.h"
+#include "match.h"
 
 
 

src/numeric.c

@@ -29,7 +29,7 @@
 #include "config.h"
 #include "s_conf.h"
 #include "numeric.h"
-#include "irc_string.h"
+#include "match.h"
 #include "common.h"		/* NULL cripes */
 
 #include "messages.tab"

src/packet.c

@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "parse.h"
 #include "packet.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hook.h"
 #include "send.h"
 

src/parse.c

@@ -31,7 +31,7 @@
 #include "channel.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "logger.h"

src/res.c

@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "res.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "client.h" /* SNO_* */
 

src/reslib.c

@@ -86,7 +86,7 @@
 #include "ircd.h"
 #include "res.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 
 #define NS_TYPE_ELT             0x40 /* EDNS0 extended label type */
 #define DNS_LABELTYPE_BITSTRING 0x41

src/s_auth.c

@@ -39,7 +39,7 @@
 #include "s_conf.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"

src/s_conf.c

@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "hostmask.h"

src/s_serv.c

@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

src/s_user.c

@@ -31,7 +31,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "msg.h"

src/scache.c

@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

src/send.c

@@ -30,7 +30,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

src/substitution.c

@@ -35,7 +35,7 @@
 
 #include "stdinc.h"
 #include "s_user.h"
-#include "irc_string.h"
+#include "match.h"
 
 /*
  * Simple mappings for $foo -> 'bar'.

src/whowas.c

@@ -30,7 +30,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

unsupported/m_clearchan.c

@@ -23,7 +23,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

unsupported/m_force.c

@@ -34,7 +34,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"