3.2!

include/common.h

@@ -37,7 +37,6 @@
 #include <io.h>
 #endif
 //#include "dynconf.h"
-#include "ircsprintf.h"
 #include "config.h"
 #ifdef	PARAMH
 #include <sys/param.h>
@@ -47,6 +46,9 @@
 #include "sys.h"
 #endif
 
+#include "ircsprintf.h"
+
+
 #ifdef DEVELOP_CVS
 #define ID_Copyright(x) static char id_copyright[] = x
 #define ID_Notes(x) static char id_notes[] = x

include/dynconf.h

@@ -52,8 +52,12 @@ enum UHAllowed { UHALLOW_ALWAYS, UHALLOW_NOCHANS, UHALLOW_REJOIN, UHALLOW_NEVER
 
 struct ChMode {
         long mode;
+#ifdef EXTCMODE
+	long extmodes;
+	char *extparams[EXTCMODETABLESZ];
+#endif
 #ifdef NEWCHFLOODPROT
-		ChanFloodProt	floodprot;
+	ChanFloodProt	floodprot;
 #else
         unsigned short  msgs;
         unsigned short  per; 

include/h.h

@@ -272,7 +272,7 @@ extern void send_channel_modes_sjoin3(aClient *cptr, aChannel *chptr);
 extern void sendto_locfailops(char *pattern, ...) __attribute__((format(printf,1,2)));
 extern void sendto_connectnotice(char *nick, anUser *user, aClient *sptr, int disconnect, char *comment);
 extern void sendto_serv_butone_nickcmd(aClient *one, aClient *sptr, char *nick, int hopcount,
-int lastnick, char *username, char *realhost, char *server, long servicestamp, char *info, char *umodes,
+long lastnick, char *username, char *realhost, char *server, long servicestamp, char *info, char *umodes,
 char *virthost);
 extern void    sendto_message_one(aClient *to, aClient *from, char *sender,
     char *cmd, char *nick, char *msg);
@@ -646,7 +646,7 @@ extern void extban_init(void);
 extern char *trim_str(char *str, int len);
 extern char *ban_realhost, *ban_virthost, *ban_ip;
 extern void join_channel(aChannel *chptr, aClient *cptr, aClient *sptr, int flags);
-extern char *unreal_checkregex(char *s, int fastsupport);
+extern char *unreal_checkregex(char *s, int fastsupport, int check_broadness);
 extern int banact_stringtoval(char *s);
 extern char *banact_valtostring(int val);
 extern int banact_chartoval(char c);
@@ -684,3 +684,4 @@ extern fdlist default_fdlist, busycli_fdlist, serv_fdlist, oper_fdlist;
 extern void DCCdeny_add(char *filename, char *reason, int type);
 extern void DCCdeny_del(ConfigItem_deny_dcc *deny);
 extern void dcc_wipe_services(void);
+extern void reread_motdsandrules();

include/ircsprintf.h

@@ -16,8 +16,13 @@
 
 /* You do want it to work in debug mode yes ? --DrBin */
 
+/* ugly hack GRR */
+#if !defined(__GNUC__) && !defined(__common_include__)
+#define __attribute__(x) /* nothing */
+#endif
+
 extern char *ircvsprintf(char *str, const char *format, va_list);
-extern char *ircsprintf(char *str, const char *format, ...);
+extern char *ircsprintf(char *str, const char *format, ...) __attribute__((format(printf,2,3)));
 
 extern const char atoi_tab[4000];
 

include/struct.h

@@ -762,7 +762,7 @@ struct Server {
 struct _spamfilter {
 	unsigned short action; /* see BAN_ACT* */
 	regex_t expr;
-	char *tkl_reason;
+	char *tkl_reason; /* spamfilter reason field [escaped by unreal_encodespace()!] */
 	TS tkl_duration;
 };
 

include/version.h

@@ -29,8 +29,8 @@
 #define UnrealProtocol 		2303
 #define PATCH1  		"3"
 #define PATCH2  		".2"
-#define PATCH3  		"-RC2"
-#define PATCH4  		"fix"
+#define PATCH3  		""
+#define PATCH4  		""
 #define PATCH5  		""
 #define PATCH6  		""
 #define PATCH7  		""

include/zip.h

@@ -24,6 +24,9 @@
  */
 #ifndef INCLUDED_s_zip_h
 #define INCLUDED_s_zip_h
+#ifdef _WIN32
+ #define ZLIB_WINAPI
+#endif
 #include <zlib.h>		/* z_stream */
 #endif