From: pk910 Date: Sat, 1 Oct 2011 20:50:43 +0000 (+0200) Subject: changed Makefile; build all commands as an own file X-Git-Tag: v5.3~354 X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=795115bf680185ae01043bd1222b78bfed8c1d87 changed Makefile; build all commands as an own file --- diff --git a/DBHelper.h b/DBHelper.h index af4cc32..8378040 100644 --- a/DBHelper.h +++ b/DBHelper.h @@ -2,8 +2,8 @@ #define _DBHelper_h #include "main.h" -#include "ChanNode.h" -#include "UserNode.h" +struct UserNode; +struct ChanNode; #define DB_CHANUSER_SUSPENDED 0x01 #define DB_CHANUSER_AUTOINVITE 0x02 diff --git a/Makefile b/Makefile index c22842c..10825e2 100644 --- a/Makefile +++ b/Makefile @@ -1,24 +1,119 @@ CC = gcc -OBJ = EventLogger.o IRCEvents.o main.o ChanNode.o \ - IRCParser.o ClientSocket.o UserNode.o ChanUser.o \ - ModeNode.o BanNode.o WHOHandler.o modcmd.o \ - mysqlConn.o lang.o HandleInfoHandler.o tools.o \ - timeq.o DBHelper.o bots.o bot_NeonServ.o - +SRC = EventLogger.c \ + IRCEvents.c \ + main.c \ + ChanNode.c \ + IRCParser.c \ + ClientSocket.c \ + UserNode.c \ + ChanUser.c \ + ModeNode.c \ + BanNode.c \ + WHOHandler.c \ + modcmd.c \ + mysqlConn.c \ + lang.c \ + HandleInfoHandler.c \ + tools.c \ + timeq.c \ + DBHelper.c \ + bots.c \ + bot_NeonServ.c +CMD = cmd_neonserv_access.c \ + cmd_neonserv_addban.c \ + cmd_neonserv_addtimeban.c \ + cmd_neonserv_adduser.c \ + cmd_neonserv_ban.c \ + cmd_neonserv_bans.c \ + cmd_neonserv_bind.c \ + cmd_neonserv_chanservsync.c \ + cmd_neonserv_clvl.c \ + cmd_neonserv_command.c \ + cmd_neonserv_csuspend.c \ + cmd_neonserv_cunsuspend.c \ + cmd_neonserv_delban.c \ + cmd_neonserv_delme.c \ + cmd_neonserv_deluser.c \ + cmd_neonserv_deop.c \ + cmd_neonserv_deopall.c \ + cmd_neonserv_devoice.c \ + cmd_neonserv_devoiceall.c \ + cmd_neonserv_down.c \ + cmd_neonserv_downall.c \ + cmd_neonserv_emote.c \ + cmd_neonserv_events.c \ + cmd_neonserv_giveowner.c \ + cmd_neonserv_god.c \ + cmd_neonserv_help.c \ + cmd_neonserv_invite.c \ + cmd_neonserv_inviteme.c \ + cmd_neonserv_kick.c \ + cmd_neonserv_kickban.c \ + cmd_neonserv_mdeluser.c \ + cmd_neonserv_mode.c \ + cmd_neonserv_move.c \ + cmd_neonserv_myaccess.c \ + cmd_neonserv_netinfo.c \ + cmd_neonserv_notice.c \ + cmd_neonserv_op.c \ + cmd_neonserv_opall.c \ + cmd_neonserv_oplog.c \ + cmd_neonserv_peek.c \ + cmd_neonserv_raw.c \ + cmd_neonserv_recover.c \ + cmd_neonserv_register.c \ + cmd_neonserv_reloadlang.c \ + cmd_neonserv_resync.c \ + cmd_neonserv_say.c \ + cmd_neonserv_search.c \ + cmd_neonserv_set.c \ + cmd_neonserv_setaccess.c \ + cmd_neonserv_suspend.c \ + cmd_neonserv_topic.c \ + cmd_neonserv_trace.c \ + cmd_neonserv_trim.c \ + cmd_neonserv_unban.c \ + cmd_neonserv_unbanall.c \ + cmd_neonserv_unbanme.c \ + cmd_neonserv_unbind.c \ + cmd_neonserv_unregister.c \ + cmd_neonserv_unsuspend.c \ + cmd_neonserv_up.c \ + cmd_neonserv_upall.c \ + cmd_neonserv_users.c \ + cmd_neonserv_uset.c \ + cmd_neonserv_version.c \ + cmd_neonserv_voice.c \ + cmd_neonserv_voiceall.c \ + cmd_neonserv_wipeinfo.c +CMD_DEPS = main.h modcmd.h IRCParser.h UserNode.h ChanNode.h ChanUser.h ModeNode.h \ + ClientSocket.h mysqlConn.h lang.h HandleInfoHandler.h WHOHandler.h DBHelper.h \ + tools.h timeq.h version.h EventLogger.h bot_NeonServ.h IRCEvents.h BanNode.h +OBJS = ${SRC:%.c=%.o} ${CMD:%.c=%.o} CFLAGS=-g -O2 -Wall -Wshadow -Werror LIBS=-I. -I/usr/include/mysql LINK=-lmysqlclient -all: $(OBJ) +all: $(OBJS) -install: $(OBJ) +install: $(OBJS) chmod +x version.sh ./version.sh $(CC) $(LIBS) -c version.c $(CFLAGS) - $(CC) $(LIBS) -o neonserv $(OBJ) version.o $(CFLAGS) $(LINK) + $(CC) $(LIBS) -o neonserv $(OBJS) version.o $(CFLAGS) $(LINK) %.o: %.c $(CC) $(LIBS) -c $< $(CFLAGS) clean: - rm *.o + rm $(OBJS) version.o + +depend: $(SRC) + mv Makefile Makefile.bak + grep -A1 -B10000 '^# DEPENDINGS' Makefile.bak > Makefile + $(CC) $(CFLAGS) -MM $(LIBS) $(SRC) >> Makefile + rm Makefile.bak + +# DEPENDINGS -- generated by make depend + + diff --git a/bot_NeonServ.c b/bot_NeonServ.c index a2dfa45..71f5942 100644 --- a/bot_NeonServ.c +++ b/bot_NeonServ.c @@ -18,6 +18,7 @@ #include "timeq.h" #include "version.h" #include "EventLogger.h" +#include "cmd_neonserv.h" #define BOTID 1 @@ -268,98 +269,22 @@ static const struct default_language_entry msgtab[] = { {NULL, NULL} }; -//define some useful functions :D -static TIMEQ_CALLBACK(channel_ban_timeout); -static struct ClientSocket *getBotForChannel(struct ChanNode *chan); - -/* -INCLUDE ALL CMD's HERE +/* TODO: +trim bans +cmd_neonserv_open.c +cmd_neonserv_info.c +parse, check and set modelock +cmd_neonserv_modcmd.c +cmd_neonserv_allowregister.c +cmd_neonserv_noregister.c +cmd_neonserv_expire.c +cmd_neonserv_unvisited.c +cmd_neonserv_merge.c +cmd_neonserv_dnrsearch.c +cmd_neonserv_rename.c +cmd_neonserv_iplocate.c +cmd_neonserv_calc.c */ -//USER CMD's -#include "cmd_neonserv_access.c" -#include "cmd_neonserv_myaccess.c" -#include "cmd_neonserv_adduser.c" -#include "cmd_neonserv_clvl.c" -#include "cmd_neonserv_deluser.c" -#include "cmd_neonserv_delme.c" -#include "cmd_neonserv_mdeluser.c" -#include "cmd_neonserv_trim.c" /* TODO: trim bans */ -#include "cmd_neonserv_giveowner.c" -#include "cmd_neonserv_users.c" -#include "cmd_neonserv_up.c" -#include "cmd_neonserv_down.c" -#include "cmd_neonserv_upall.c" -#include "cmd_neonserv_downall.c" -#include "cmd_neonserv_op.c" -#include "cmd_neonserv_opall.c" -#include "cmd_neonserv_deop.c" -#include "cmd_neonserv_deopall.c" -#include "cmd_neonserv_voice.c" -#include "cmd_neonserv_voiceall.c" -#include "cmd_neonserv_devoice.c" -#include "cmd_neonserv_devoiceall.c" -#include "cmd_neonserv_uset.c" -#include "cmd_neonserv_kick.c" -#include "cmd_neonserv_kickban.c" -#include "cmd_neonserv_ban.c" -#include "cmd_neonserv_unban.c" -#include "cmd_neonserv_unbanall.c" -#include "cmd_neonserv_unbanme.c" -#include "cmd_neonserv_suspend.c" -#include "cmd_neonserv_unsuspend.c" -#include "cmd_neonserv_wipeinfo.c" -#include "cmd_neonserv_addban.c" -#include "cmd_neonserv_addtimeban.c" -#include "cmd_neonserv_delban.c" -#include "cmd_neonserv_bans.c" -//#include "cmd_neonserv_open.c" -#include "cmd_neonserv_topic.c" -#include "cmd_neonserv_mode.c" -#include "cmd_neonserv_invite.c" -#include "cmd_neonserv_inviteme.c" -//#include "cmd_neonserv_info.c" -#include "cmd_neonserv_netinfo.c" -#include "cmd_neonserv_peek.c" -#include "cmd_neonserv_set.c" /* TODO: parse, check and set modelock */ -#include "cmd_neonserv_resync.c" -#include "cmd_neonserv_help.c" -#include "cmd_neonserv_version.c" -#include "cmd_neonserv_chanservsync.c" -#include "cmd_neonserv_events.c" -#include "cmd_neonserv_command.c" - -//OPER CMD's -#include "cmd_neonserv_bind.c" -#include "cmd_neonserv_unbind.c" -//#include "cmd_neonserv_modcmd.c" -#include "cmd_neonserv_register.c" -#include "cmd_neonserv_unregister.c" -#include "cmd_neonserv_recover.c" -//#include "cmd_neonserv_allowregister.c" -//#include "cmd_neonserv_noregister.c" -#include "cmd_neonserv_god.c" -//#include "cmd_neonserv_expire.c" -#include "cmd_neonserv_csuspend.c" -#include "cmd_neonserv_cunsuspend.c" -//#include "cmd_neonserv_unvisited.c" -//#include "cmd_neonserv_merge.c" -#include "cmd_neonserv_move.c" -//#include "cmd_neonserv_dnrsearch.c" -#include "cmd_neonserv_search.c" -#include "cmd_neonserv_trace.c" -#include "cmd_neonserv_say.c" -#include "cmd_neonserv_emote.c" -#include "cmd_neonserv_notice.c" -#include "cmd_neonserv_raw.c" -#include "cmd_neonserv_reloadlang.c" -#include "cmd_neonserv_oplog.c" -//#include "cmd_neonserv_rename.c" -#include "cmd_neonserv_setaccess.c" - -//HARDCODED FUN CMD's -//#include "cmd_neonserv_iplocate.c" -//#include "cmd_neonserv_calc.c" - //EVENTS #include "event_neonserv_join.c" #include "event_neonserv_part.c" @@ -371,7 +296,7 @@ INCLUDE ALL CMD's HERE #include "event_neonserv_invite.c" #include "event_neonserv_topic.c" -static struct ClientSocket *getBotForChannel(struct ChanNode *chan) { +struct ClientSocket *getBotForChannel(struct ChanNode *chan) { struct ClientSocket *bot, *use_bot = NULL, *second_bot = NULL, *third_bot = NULL; struct ChanUser *chanuser; for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) { @@ -465,7 +390,7 @@ static void start_bots() { } } -static TIMEQ_CALLBACK(channel_ban_timeout) { +TIMEQ_CALLBACK(channel_ban_timeout) { char *str_banid = data; MYSQL_RES *res; MYSQL_ROW row; diff --git a/bot_NeonServ.h b/bot_NeonServ.h index 8e33e23..90bd696 100644 --- a/bot_NeonServ.h +++ b/bot_NeonServ.h @@ -2,9 +2,15 @@ #define _bot_NeonServ_h #include "main.h" +#include "timeq.h" + +struct ChanNode; void init_NeonServ(); void loop_NeonServ(); void free_NeonServ(); +TIMEQ_CALLBACK(channel_ban_timeout); +struct ClientSocket *getBotForChannel(struct ChanNode *chan); + #endif \ No newline at end of file diff --git a/cmd_neonserv.h b/cmd_neonserv.h new file mode 100644 index 0000000..6b8fee1 --- /dev/null +++ b/cmd_neonserv.h @@ -0,0 +1,92 @@ +#ifndef _cmd_neonserv_h +#define _cmd_neonserv_h +#include "main.h" +#include "modcmd.h" +#include "IRCParser.h" +#include "IRCEvents.h" +#include "UserNode.h" +#include "ChanNode.h" +#include "ChanUser.h" +#include "ModeNode.h" +#include "BanNode.h" +#include "ClientSocket.h" +#include "mysqlConn.h" +#include "lang.h" +#include "HandleInfoHandler.h" +#include "WHOHandler.h" +#include "DBHelper.h" +#include "tools.h" +#include "timeq.h" +#include "version.h" +#include "EventLogger.h" +#include "bot_NeonServ.h" + +CMD_BIND(neonserv_cmd_access); +CMD_BIND(neonserv_cmd_addban); +CMD_BIND(neonserv_cmd_addtimeban); +CMD_BIND(neonserv_cmd_adduser); +CMD_BIND(neonserv_cmd_ban); +CMD_BIND(neonserv_cmd_bans); +CMD_BIND(neonserv_cmd_bind); +CMD_BIND(neonserv_cmd_chanservsync); +CMD_BIND(neonserv_cmd_clvl); +CMD_BIND(neonserv_cmd_command); +CMD_BIND(neonserv_cmd_csuspend); +CMD_BIND(neonserv_cmd_cunsuspend); +CMD_BIND(neonserv_cmd_delban); +CMD_BIND(neonserv_cmd_delme); +CMD_BIND(neonserv_cmd_deluser); +CMD_BIND(neonserv_cmd_deop); +CMD_BIND(neonserv_cmd_deopall); +CMD_BIND(neonserv_cmd_devoice); +CMD_BIND(neonserv_cmd_devoiceall); +CMD_BIND(neonserv_cmd_down); +CMD_BIND(neonserv_cmd_downall); +CMD_BIND(neonserv_cmd_emote); +CMD_BIND(neonserv_cmd_events); +CMD_BIND(neonserv_cmd_giveowner); +CMD_BIND(neonserv_cmd_god); +CMD_BIND(neonserv_cmd_help); +CMD_BIND(neonserv_cmd_invite); +CMD_BIND(neonserv_cmd_inviteme); +CMD_BIND(neonserv_cmd_kick); +CMD_BIND(neonserv_cmd_kickban); +CMD_BIND(neonserv_cmd_mdeluser); +CMD_BIND(neonserv_cmd_mode); +CMD_BIND(neonserv_cmd_move); +CMD_BIND(neonserv_cmd_myaccess); +CMD_BIND(neonserv_cmd_netinfo); +CMD_BIND(neonserv_cmd_notice); +CMD_BIND(neonserv_cmd_op); +CMD_BIND(neonserv_cmd_opall); +CMD_BIND(neonserv_cmd_oplog); +CMD_BIND(neonserv_cmd_peek); +CMD_BIND(neonserv_cmd_raw); +CMD_BIND(neonserv_cmd_recover); +CMD_BIND(neonserv_cmd_register); +CMD_BIND(neonserv_cmd_reloadlang); +CMD_BIND(neonserv_cmd_resync); +CMD_BIND(neonserv_cmd_say); +CMD_BIND(neonserv_cmd_search); +CMD_BIND(neonserv_cmd_set); +CMD_BIND(neonserv_cmd_setaccess); +CMD_BIND(neonserv_cmd_suspend); +CMD_BIND(neonserv_cmd_topic); +CMD_BIND(neonserv_cmd_trace); +CMD_BIND(neonserv_cmd_trim); +CMD_BIND(neonserv_cmd_unban); +CMD_BIND(neonserv_cmd_unbanall); +CMD_BIND(neonserv_cmd_unbanme); +CMD_BIND(neonserv_cmd_unbind); +CMD_BIND(neonserv_cmd_unregister); +CMD_BIND(neonserv_cmd_unsuspend); +CMD_BIND(neonserv_cmd_up); +CMD_BIND(neonserv_cmd_upall); +CMD_BIND(neonserv_cmd_users); +CMD_BIND(neonserv_cmd_uset); +CMD_BIND(neonserv_cmd_version); +CMD_BIND(neonserv_cmd_voice); +CMD_BIND(neonserv_cmd_voiceall); +CMD_BIND(neonserv_cmd_wipeinfo); + +#endif \ No newline at end of file diff --git a/cmd_neonserv_access.c b/cmd_neonserv_access.c index 6c082e5..aa11b00 100644 --- a/cmd_neonserv_access.c +++ b/cmd_neonserv_access.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth */ @@ -12,7 +14,7 @@ struct neonserv_cmd_access_cache { char *nick; }; -static CMD_BIND(neonserv_cmd_access) { +CMD_BIND(neonserv_cmd_access) { if(argc == 0) { if(!(user->flags & USERFLAG_ISAUTHED)) { struct neonserv_cmd_access_cache *cache = malloc(sizeof(*cache)); diff --git a/cmd_neonserv_addban.c b/cmd_neonserv_addban.c index 91da9f8..b799c4b 100644 --- a/cmd_neonserv_addban.c +++ b/cmd_neonserv_addban.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] nick|*auth|*!*@mask * argv[1-*] reason @@ -14,7 +16,7 @@ struct neonserv_cmd_addban_cache { char *reason; }; -static CMD_BIND(neonserv_cmd_addban) { +CMD_BIND(neonserv_cmd_addban) { struct neonserv_cmd_addban_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_addtimeban.c b/cmd_neonserv_addtimeban.c index 09eeefb..8a8d567 100644 --- a/cmd_neonserv_addtimeban.c +++ b/cmd_neonserv_addtimeban.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] nick|*auth|*!*@mask * argv[1] time @@ -16,7 +18,7 @@ struct neonserv_cmd_addtimeban_cache { char *reason; }; -static CMD_BIND(neonserv_cmd_addtimeban) { +CMD_BIND(neonserv_cmd_addtimeban) { int duration = strToTime(user, argv[1]); if(duration < 30) { reply(getTextBot(), user, "NS_TIMEBAN_DURATION_TOO_SHORT", 30); diff --git a/cmd_neonserv_adduser.c b/cmd_neonserv_adduser.c index ffd2224..c63c176 100644 --- a/cmd_neonserv_adduser.c +++ b/cmd_neonserv_adduser.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth * argv[1] - chan access @@ -16,7 +18,7 @@ struct neonserv_cmd_adduser_cache { char *nick; }; -static CMD_BIND(neonserv_cmd_adduser) { +CMD_BIND(neonserv_cmd_adduser) { int caccess; MYSQL_RES *res; MYSQL_ROW row; diff --git a/cmd_neonserv_ban.c b/cmd_neonserv_ban.c index ee43f21..eec7326 100644 --- a/cmd_neonserv_ban.c +++ b/cmd_neonserv_ban.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nick[,*auth[,*!*@mask[...]]] */ @@ -12,7 +14,7 @@ struct neonserv_cmd_ban_cache { char *masks; }; -static CMD_BIND(neonserv_cmd_ban) { +CMD_BIND(neonserv_cmd_ban) { struct neonserv_cmd_ban_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_bans.c b/cmd_neonserv_bans.c index 742489c..31231d4 100644 --- a/cmd_neonserv_bans.c +++ b/cmd_neonserv_bans.c @@ -1,8 +1,10 @@ +#include "cmd_neonserv.h" + /* * argv[0] (optional) mask */ -static CMD_BIND(neonserv_cmd_bans) { +CMD_BIND(neonserv_cmd_bans) { MYSQL_RES *res; MYSQL_ROW row; //ban list diff --git a/cmd_neonserv_bind.c b/cmd_neonserv_bind.c index 35b4d12..3c80478 100644 --- a/cmd_neonserv_bind.c +++ b/cmd_neonserv_bind.c @@ -1,11 +1,13 @@ +#include "cmd_neonserv.h" + /* * argv[0] command name * argv[1] command function * argv[2-*] parameters (optional) */ -static CMD_BIND(neonserv_cmd_bind) { +CMD_BIND(neonserv_cmd_bind) { MYSQL_RES *res; MYSQL_ROW row; printf_mysql_query("SELECT `function` FROM `bot_binds` WHERE `botclass` = '%d' AND `command` = '%s'", client->botid, escape_string(argv[0])); diff --git a/cmd_neonserv_chanservsync.c b/cmd_neonserv_chanservsync.c index 31548f9..5603300 100644 --- a/cmd_neonserv_chanservsync.c +++ b/cmd_neonserv_chanservsync.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - botnick * argv[1] - key @@ -30,7 +32,7 @@ struct neonserv_cmd_chanservsync_auth_cache { struct neonserv_cmd_chanservsync_cache *neonserv_cmd_chanservsync_used = NULL; const char* neonserv_cmd_chanservsync_supported[] = {"ChanServ", NULL}; -static CMD_BIND(neonserv_cmd_chanservsync) { +CMD_BIND(neonserv_cmd_chanservsync) { if(neonserv_cmd_chanservsync_used && time(0) - neonserv_cmd_chanservsync_used->last_response < CHANSERVSYNC_END_TIMEOUT) { reply(getTextBot(), user, "NS_CHANSERVSYNC_INUSE"); return; diff --git a/cmd_neonserv_clvl.c b/cmd_neonserv_clvl.c index 328b454..ff386b2 100644 --- a/cmd_neonserv_clvl.c +++ b/cmd_neonserv_clvl.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth * argv[1] - access @@ -15,7 +17,7 @@ struct neonserv_cmd_clvl_cache { int access; }; -static CMD_BIND(neonserv_cmd_clvl) { +CMD_BIND(neonserv_cmd_clvl) { int caccess; caccess = atoi(argv[1]); if(caccess <= 0 || caccess > 500) { diff --git a/cmd_neonserv_command.c b/cmd_neonserv_command.c index 874816d..0f34ea0 100644 --- a/cmd_neonserv_command.c +++ b/cmd_neonserv_command.c @@ -1,11 +1,13 @@ +#include "cmd_neonserv.h" + /* * argv[0-1] command */ static int neonserv_cmd_command_chanaccess(struct cmd_binding *cbind, struct ChanNode *chan); static int neonserv_cmd_command_operaccess(struct cmd_binding *cbind); -static CMD_BIND(neonserv_cmd_command) { +CMD_BIND(neonserv_cmd_command) { char *ident; MYSQL_RES *res; MYSQL_ROW row; diff --git a/cmd_neonserv_csuspend.c b/cmd_neonserv_csuspend.c index d90ac64..23b2381 100644 --- a/cmd_neonserv_csuspend.c +++ b/cmd_neonserv_csuspend.c @@ -1,8 +1,10 @@ +#include "cmd_neonserv.h" + /* * argv[0] - channel */ -static CMD_BIND(neonserv_cmd_csuspend) { +CMD_BIND(neonserv_cmd_csuspend) { MYSQL_RES *res; MYSQL_ROW row; char *channel = argv[0]; diff --git a/cmd_neonserv_cunsuspend.c b/cmd_neonserv_cunsuspend.c index 80597ce..0902ff2 100644 --- a/cmd_neonserv_cunsuspend.c +++ b/cmd_neonserv_cunsuspend.c @@ -1,8 +1,10 @@ +#include "cmd_neonserv.h" + /* * argv[0] - channel */ -static CMD_BIND(neonserv_cmd_cunsuspend) { +CMD_BIND(neonserv_cmd_cunsuspend) { MYSQL_RES *res; MYSQL_ROW row; char *channel = argv[0]; diff --git a/cmd_neonserv_delban.c b/cmd_neonserv_delban.c index 016008b..ac8b696 100644 --- a/cmd_neonserv_delban.c +++ b/cmd_neonserv_delban.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0] nick|*auth|*!*@mask */ -static CMD_BIND(neonserv_cmd_delban) { +CMD_BIND(neonserv_cmd_delban) { char hostmask_buffer[NICKLEN+USERLEN+HOSTLEN+3]; char *mask = make_banmask(argv[0], hostmask_buffer); int matching_bans = 0; diff --git a/cmd_neonserv_delme.c b/cmd_neonserv_delme.c index e487f1b..daf6ff4 100644 --- a/cmd_neonserv_delme.c +++ b/cmd_neonserv_delme.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0] - key */ -static CMD_BIND(neonserv_cmd_delme) { +CMD_BIND(neonserv_cmd_delme) { MYSQL_RES *res; MYSQL_ROW row; int userid; diff --git a/cmd_neonserv_deluser.c b/cmd_neonserv_deluser.c index a90862a..b6ff283 100644 --- a/cmd_neonserv_deluser.c +++ b/cmd_neonserv_deluser.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth */ @@ -13,7 +15,7 @@ struct neonserv_cmd_deluser_cache { char *nick; }; -static CMD_BIND(neonserv_cmd_deluser) { +CMD_BIND(neonserv_cmd_deluser) { if(argv[0][0] == '*') { //we've got an auth argv[0]++; diff --git a/cmd_neonserv_deop.c b/cmd_neonserv_deop.c index 526cf1b..d0ee75e 100644 --- a/cmd_neonserv_deop.c +++ b/cmd_neonserv_deop.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nicks */ @@ -13,7 +15,7 @@ struct neonserv_cmd_deop_cache { int argc; }; -static CMD_BIND(neonserv_cmd_deop) { +CMD_BIND(neonserv_cmd_deop) { struct neonserv_cmd_deop_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_deopall.c b/cmd_neonserv_deopall.c index 7f04595..f9ee763 100644 --- a/cmd_neonserv_deopall.c +++ b/cmd_neonserv_deopall.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] (optional) nick mask */ @@ -13,7 +15,7 @@ struct neonserv_cmd_deopall_cache { int argc; }; -static CMD_BIND(neonserv_cmd_deopall) { +CMD_BIND(neonserv_cmd_deopall) { struct neonserv_cmd_deopall_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_devoice.c b/cmd_neonserv_devoice.c index 998dd9f..6994679 100644 --- a/cmd_neonserv_devoice.c +++ b/cmd_neonserv_devoice.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nicks */ -static CMD_BIND(neonserv_cmd_devoice) { +CMD_BIND(neonserv_cmd_devoice) { int i, done_users = 0; struct UserNode *cuser; struct ChanUser *chanuser; diff --git a/cmd_neonserv_devoiceall.c b/cmd_neonserv_devoiceall.c index bc3112d..3c201af 100644 --- a/cmd_neonserv_devoiceall.c +++ b/cmd_neonserv_devoiceall.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0] (optional) nick mask */ -static CMD_BIND(neonserv_cmd_devoiceall) { +CMD_BIND(neonserv_cmd_devoiceall) { int issuer_access, victim_access, done_users = 0; char *nickmask = NULL; struct ChanUser *chanuser; diff --git a/cmd_neonserv_down.c b/cmd_neonserv_down.c index eb81b08..e504070 100644 --- a/cmd_neonserv_down.c +++ b/cmd_neonserv_down.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * no arguments */ -static CMD_BIND(neonserv_cmd_down) { +CMD_BIND(neonserv_cmd_down) { struct ChanUser *chanuser = getChanUser(user, chan); if(!chanuser) { reply(getTextBot(), user, "NS_NOT_ON_CHANNEL_YOU", chan->name); diff --git a/cmd_neonserv_downall.c b/cmd_neonserv_downall.c index 643d1ae..1d001c9 100644 --- a/cmd_neonserv_downall.c +++ b/cmd_neonserv_downall.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * no arguments */ -static CMD_BIND(neonserv_cmd_downall) { +CMD_BIND(neonserv_cmd_downall) { struct ChanUser *chanuser; for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = getUserChannels(user, chanuser)) { chan = chanuser->chan; diff --git a/cmd_neonserv_emote.c b/cmd_neonserv_emote.c index fcf6a89..427a30f 100644 --- a/cmd_neonserv_emote.c +++ b/cmd_neonserv_emote.c @@ -1,10 +1,12 @@ +#include "cmd_neonserv.h" + /* * argv[0] target * argv[1-*] message */ -static CMD_BIND(neonserv_cmd_emote) { +CMD_BIND(neonserv_cmd_emote) { char *message = merge_argv(argv, 1, argc); putsock(client, "PRIVMSG %s :\001ACTION %s\001", argv[0], message); } \ No newline at end of file diff --git a/cmd_neonserv_events.c b/cmd_neonserv_events.c index 586fdac..23ecf3c 100644 --- a/cmd_neonserv_events.c +++ b/cmd_neonserv_events.c @@ -1,10 +1,12 @@ +#include "cmd_neonserv.h" + /* * argv[0] time * argv[1-*] match */ -static CMD_BIND(neonserv_cmd_events) { +CMD_BIND(neonserv_cmd_events) { char *str_match; int duration = (argc ? strToTime(user, argv[0]) : 0); if(argc > (duration ? 1 : 0)) diff --git a/cmd_neonserv_giveowner.c b/cmd_neonserv_giveowner.c index 450d634..8f173ac 100644 --- a/cmd_neonserv_giveowner.c +++ b/cmd_neonserv_giveowner.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth * argv[1] - key @@ -18,7 +20,7 @@ struct neonserv_cmd_giveowner_cache { char *key; }; -static CMD_BIND(neonserv_cmd_giveowner) { +CMD_BIND(neonserv_cmd_giveowner) { MYSQL_RES *res; MYSQL_ROW row; printf_mysql_query("SELECT `channel_lastgiveowner` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); diff --git a/cmd_neonserv_god.c b/cmd_neonserv_god.c index 54c6163..96abaa6 100644 --- a/cmd_neonserv_god.c +++ b/cmd_neonserv_god.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0] (optional) on/off */ -static CMD_BIND(neonserv_cmd_god) { +CMD_BIND(neonserv_cmd_god) { if(argc > 0) { if(!strcmp(argv[0], "0") || !stricmp(argv[0], "off") || !stricmp(argv[0], get_language_string(user, "NS_SET_OFF"))) { if(isGodMode(user)) { diff --git a/cmd_neonserv_help.c b/cmd_neonserv_help.c index 5c669a2..081fc22 100644 --- a/cmd_neonserv_help.c +++ b/cmd_neonserv_help.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] index */ -static CMD_BIND(neonserv_cmd_help) { +CMD_BIND(neonserv_cmd_help) { char *ident; if(argc) ident = merge_argv(argv, 0, argc); diff --git a/cmd_neonserv_invite.c b/cmd_neonserv_invite.c index 7610aa6..f7fcd62 100644 --- a/cmd_neonserv_invite.c +++ b/cmd_neonserv_invite.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth */ @@ -27,7 +29,7 @@ struct neonserv_cmd_invite_timeout { static struct neonserv_cmd_invite_timeout *first_timeout = NULL, *last_timeout = NULL; -static CMD_BIND(neonserv_cmd_invite) { +CMD_BIND(neonserv_cmd_invite) { if(neonserv_cmd_invite_is_timeout(argv[0], chan->name)) { reply(getTextBot(), user, "NS_INVITE_TIMEOUT", argv[0], chan->name); return; diff --git a/cmd_neonserv_inviteme.c b/cmd_neonserv_inviteme.c index e5c5319..a5c3f16 100644 --- a/cmd_neonserv_inviteme.c +++ b/cmd_neonserv_inviteme.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * no arguments */ -static CMD_BIND(neonserv_cmd_inviteme) { +CMD_BIND(neonserv_cmd_inviteme) { if(getChanUser(user, chan)) { reply(getTextBot(), user, "NS_INVITEME_ON_CHAN", chan->name); /* BUG diff --git a/cmd_neonserv_kick.c b/cmd_neonserv_kick.c index 0a97087..373881c 100644 --- a/cmd_neonserv_kick.c +++ b/cmd_neonserv_kick.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] nick[,*auth[,*!*@mask[...]]] * argv[1-*] reason @@ -14,7 +16,7 @@ struct neonserv_cmd_kick_cache { char *reason; }; -static CMD_BIND(neonserv_cmd_kick) { +CMD_BIND(neonserv_cmd_kick) { struct neonserv_cmd_kick_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_kickban.c b/cmd_neonserv_kickban.c index 3d0081f..1907706 100644 --- a/cmd_neonserv_kickban.c +++ b/cmd_neonserv_kickban.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] nick[,*auth[,*!*@mask[...]]] * argv[1-*] reason @@ -14,7 +16,7 @@ struct neonserv_cmd_kickban_cache { char *reason; }; -static CMD_BIND(neonserv_cmd_kickban) { +CMD_BIND(neonserv_cmd_kickban) { struct neonserv_cmd_kickban_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_mdeluser.c b/cmd_neonserv_mdeluser.c index 5ca9727..5b09822 100644 --- a/cmd_neonserv_mdeluser.c +++ b/cmd_neonserv_mdeluser.c @@ -1,10 +1,12 @@ +#include "cmd_neonserv.h" + /* * argv[0] access (format: minaccess-maxaccess) * argv[1] pattern */ -static CMD_BIND(neonserv_cmd_mdeluser) { +CMD_BIND(neonserv_cmd_mdeluser) { if(!checkChannelAccess(user, chan, "channel_candel", 1, 0)) { reply(getTextBot(), user, "NS_ACCESS_DENIED"); return; diff --git a/cmd_neonserv_mode.c b/cmd_neonserv_mode.c index ac593ab..f7f2db1 100644 --- a/cmd_neonserv_mode.c +++ b/cmd_neonserv_mode.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - modes * argv[1-*] - parameters @@ -13,7 +15,7 @@ struct neonserv_cmd_mode_cache { char *mode; }; -static CMD_BIND(neonserv_cmd_mode) { +CMD_BIND(neonserv_cmd_mode) { struct neonserv_cmd_mode_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_move.c b/cmd_neonserv_move.c index 6dc3908..804954f 100644 --- a/cmd_neonserv_move.c +++ b/cmd_neonserv_move.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0] - channel * argv[1] - new channel */ -static CMD_BIND(neonserv_cmd_move) { +CMD_BIND(neonserv_cmd_move) { MYSQL_RES *res; MYSQL_ROW row; char *channel = argv[0]; diff --git a/cmd_neonserv_myaccess.c b/cmd_neonserv_myaccess.c index 281e7a1..093e28a 100644 --- a/cmd_neonserv_myaccess.c +++ b/cmd_neonserv_myaccess.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth */ @@ -13,7 +15,7 @@ struct neonserv_cmd_myaccess_cache { char *chanmatch; }; -static CMD_BIND(neonserv_cmd_myaccess) { +CMD_BIND(neonserv_cmd_myaccess) { char *chanmatch = NULL; if(argc == 0 || argv[0][0] == '#') { if(argc != 0) { diff --git a/cmd_neonserv_netinfo.c b/cmd_neonserv_netinfo.c index b08fc8f..c8fd1b6 100644 --- a/cmd_neonserv_netinfo.c +++ b/cmd_neonserv_netinfo.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * no args */ -static CMD_BIND(neonserv_cmd_netinfo) { +CMD_BIND(neonserv_cmd_netinfo) { reply(getTextBot(), user, "NS_NETINFO_HEADER"); char tmp[MAXLEN]; struct Table *table; diff --git a/cmd_neonserv_notice.c b/cmd_neonserv_notice.c index 3d4faa9..26776c0 100644 --- a/cmd_neonserv_notice.c +++ b/cmd_neonserv_notice.c @@ -1,10 +1,12 @@ +#include "cmd_neonserv.h" + /* * argv[0] target * argv[1-*] message */ -static CMD_BIND(neonserv_cmd_notice) { +CMD_BIND(neonserv_cmd_notice) { char *message = merge_argv(argv, 1, argc); putsock(client, "NOTICE %s :%s", argv[0], message); } \ No newline at end of file diff --git a/cmd_neonserv_op.c b/cmd_neonserv_op.c index 6e6d0d8..2bf69c0 100644 --- a/cmd_neonserv_op.c +++ b/cmd_neonserv_op.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nicks */ @@ -12,7 +14,7 @@ struct neonserv_cmd_op_cache { char *nicks; }; -static CMD_BIND(neonserv_cmd_op) { +CMD_BIND(neonserv_cmd_op) { struct neonserv_cmd_op_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_opall.c b/cmd_neonserv_opall.c index dfd6eef..d97feff 100644 --- a/cmd_neonserv_opall.c +++ b/cmd_neonserv_opall.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] "force" * argv[1] (optional) nick mask @@ -13,7 +15,7 @@ struct neonserv_cmd_opall_cache { char *nickmask; }; -static CMD_BIND(neonserv_cmd_opall) { +CMD_BIND(neonserv_cmd_opall) { if(!argc || strcmp(argv[0], "FORCE")) { reply(getTextBot(), user, "NS_OPALL_SECURITY", chan->name); return; diff --git a/cmd_neonserv_oplog.c b/cmd_neonserv_oplog.c index 0bf8689..a69c449 100644 --- a/cmd_neonserv_oplog.c +++ b/cmd_neonserv_oplog.c @@ -1,10 +1,12 @@ +#include "cmd_neonserv.h" + /* * argv[0] time * argv[1-*] match */ -static CMD_BIND(neonserv_cmd_oplog) { +CMD_BIND(neonserv_cmd_oplog) { char *str_match; int duration = (argc ? strToTime(user, argv[0]) : 0); if(argc > (duration ? 1 : 0)) diff --git a/cmd_neonserv_peek.c b/cmd_neonserv_peek.c index c4bdbeb..6724403 100644 --- a/cmd_neonserv_peek.c +++ b/cmd_neonserv_peek.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * no parameters */ @@ -10,7 +12,7 @@ struct neonserv_cmd_peek_cache { struct UserNode *user; }; -static CMD_BIND(neonserv_cmd_peek) { +CMD_BIND(neonserv_cmd_peek) { struct neonserv_cmd_peek_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_raw.c b/cmd_neonserv_raw.c index 682c699..4ccce79 100644 --- a/cmd_neonserv_raw.c +++ b/cmd_neonserv_raw.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] raw */ -static CMD_BIND(neonserv_cmd_raw) { +CMD_BIND(neonserv_cmd_raw) { char *raw = merge_argv(argv, 0, argc); putsock(client, "%s", raw); } \ No newline at end of file diff --git a/cmd_neonserv_recover.c b/cmd_neonserv_recover.c index 544112a..b52e5cc 100644 --- a/cmd_neonserv_recover.c +++ b/cmd_neonserv_recover.c @@ -1,8 +1,10 @@ +#include "cmd_neonserv.h" + /* * argv[0] - channel */ -static CMD_BIND(neonserv_cmd_recover) { +CMD_BIND(neonserv_cmd_recover) { MYSQL_RES *res; MYSQL_ROW row, row2; char *channel = argv[0]; diff --git a/cmd_neonserv_register.c b/cmd_neonserv_register.c index 0814e58..d336d7f 100644 --- a/cmd_neonserv_register.c +++ b/cmd_neonserv_register.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - channel * argv[0/1] - nick / *auth @@ -16,7 +18,7 @@ struct neonserv_cmd_register_cache { char *channel; }; -static CMD_BIND(neonserv_cmd_register) { +CMD_BIND(neonserv_cmd_register) { MYSQL_RES *res; MYSQL_ROW row; char *channel = argv[0]; diff --git a/cmd_neonserv_reloadlang.c b/cmd_neonserv_reloadlang.c index 8153f41..e5c4f6b 100644 --- a/cmd_neonserv_reloadlang.c +++ b/cmd_neonserv_reloadlang.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0] language tag */ -static CMD_BIND(neonserv_cmd_reloadlang) { +CMD_BIND(neonserv_cmd_reloadlang) { MYSQL_RES *res; MYSQL_ROW row; printf_mysql_query("SELECT `text`, `lang` FROM `language` WHERE `ident` = 'name' AND `lang` = '%s'", escape_string(argv[0])); diff --git a/cmd_neonserv_resync.c b/cmd_neonserv_resync.c index 888ff3d..c9d4bba 100644 --- a/cmd_neonserv_resync.c +++ b/cmd_neonserv_resync.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - usermask * argv[1] - min access @@ -15,7 +17,7 @@ struct neonserv_cmd_resync_cache { int max_access; }; -static CMD_BIND(neonserv_cmd_resync) { +CMD_BIND(neonserv_cmd_resync) { int min_access = 0, max_access = 500; char *usermask = NULL; if(argc > 0) diff --git a/cmd_neonserv_say.c b/cmd_neonserv_say.c index bede819..fdf3c50 100644 --- a/cmd_neonserv_say.c +++ b/cmd_neonserv_say.c @@ -1,10 +1,12 @@ +#include "cmd_neonserv.h" + /* * argv[0] target * argv[1-*] message */ -static CMD_BIND(neonserv_cmd_say) { +CMD_BIND(neonserv_cmd_say) { char *message = merge_argv(argv, 1, argc); putsock(client, "PRIVMSG %s :%s", argv[0], message); } \ No newline at end of file diff --git a/cmd_neonserv_search.c b/cmd_neonserv_search.c index cd0e37c..0691366 100644 --- a/cmd_neonserv_search.c +++ b/cmd_neonserv_search.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + #define CMD_SEARCH_FLAG_HAS_NODELETE 0x01 #define CMD_SEARCH_FLAG_NOT_NODELETE 0x02 #define CMD_SEARCH_FLAG_HAS_SUSPENDED 0x04 @@ -13,7 +15,7 @@ struct neonserv_cmd_search_criteria { unsigned int limit : 16; }; -static CMD_BIND(neonserv_cmd_search) { +CMD_BIND(neonserv_cmd_search) { //ok parse the criterias struct neonserv_cmd_search_criteria *criteria = malloc(sizeof(*criteria)); if (!criteria) { diff --git a/cmd_neonserv_set.c b/cmd_neonserv_set.c index 54836f5..2801be7 100644 --- a/cmd_neonserv_set.c +++ b/cmd_neonserv_set.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + typedef char* neonserv_cmd_set_function(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument); static void neonserv_cmd_set_setting(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, int setting, char *argument); static char* neonserv_cmd_set_trigger(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument); @@ -63,7 +65,7 @@ static const struct { }; #define MAX_QUERY_LEN 1024 -static CMD_BIND(neonserv_cmd_set) { +CMD_BIND(neonserv_cmd_set) { int i, j; if(argc && !strcmp(argv[0], "defaults")) { //reset channel settings diff --git a/cmd_neonserv_setaccess.c b/cmd_neonserv_setaccess.c index c378ac9..37549d2 100644 --- a/cmd_neonserv_setaccess.c +++ b/cmd_neonserv_setaccess.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth * argv[1] - global access @@ -15,7 +17,7 @@ struct neonserv_cmd_setaccess_cache { char *nick; }; -static CMD_BIND(neonserv_cmd_setaccess) { +CMD_BIND(neonserv_cmd_setaccess) { int caccess; MYSQL_RES *res; MYSQL_ROW row; diff --git a/cmd_neonserv_suspend.c b/cmd_neonserv_suspend.c index 48c88c5..4db9a50 100644 --- a/cmd_neonserv_suspend.c +++ b/cmd_neonserv_suspend.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth */ @@ -13,7 +15,7 @@ struct neonserv_cmd_suspend_cache { char *nick; }; -static CMD_BIND(neonserv_cmd_suspend) { +CMD_BIND(neonserv_cmd_suspend) { if(argv[0][0] == '*') { //we've got an auth argv[0]++; diff --git a/cmd_neonserv_topic.c b/cmd_neonserv_topic.c index 69f5a91..2673f15 100644 --- a/cmd_neonserv_topic.c +++ b/cmd_neonserv_topic.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * ADVANCEDTOPIC enabled * argv[0] topic id @@ -10,7 +12,7 @@ #define ADVANCEDTOPIC_MAXID 9 -static CMD_BIND(neonserv_cmd_topic) { +CMD_BIND(neonserv_cmd_topic) { MYSQL_RES *res; MYSQL_ROW row, default_row = NULL; int advanced_topic, i; diff --git a/cmd_neonserv_trace.c b/cmd_neonserv_trace.c index 9f8da27..d2568a5 100644 --- a/cmd_neonserv_trace.c +++ b/cmd_neonserv_trace.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + #define NS_TRACE_CRITERIA_AUTHED 0x01 #define NS_TRACE_CRITERIA_NUMCHAN 0x02 @@ -16,7 +18,7 @@ struct neonserv_cmd_trace_criteria { unsigned int limit : 16; }; -static CMD_BIND(neonserv_cmd_trace) { +CMD_BIND(neonserv_cmd_trace) { //ok parse the criterias struct neonserv_cmd_trace_criteria *criteria = malloc(sizeof(*criteria)); if (!criteria) { diff --git a/cmd_neonserv_trim.c b/cmd_neonserv_trim.c index 749b753..67501a7 100644 --- a/cmd_neonserv_trim.c +++ b/cmd_neonserv_trim.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] target (format: minaccess-maxaccess/users/bans) * argv[1] duration @@ -15,7 +17,7 @@ struct neonserv_cmd_trim_cache { int duration; }; -static CMD_BIND(neonserv_cmd_trim) { +CMD_BIND(neonserv_cmd_trim) { if(stricmp(argv[0], "bans") && !checkChannelAccess(user, chan, "channel_candel", 0, 0)) { if(isGodMode(user)) { event->flags |= CMDFLAG_OPLOG; diff --git a/cmd_neonserv_unban.c b/cmd_neonserv_unban.c index d4f9dc6..073bf50 100644 --- a/cmd_neonserv_unban.c +++ b/cmd_neonserv_unban.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nick[,*auth[,*!*@mask[...]]] */ @@ -16,7 +18,7 @@ static void neonserv_cmd_unban_nick(struct neonserv_cmd_unban_cache *cache, stru static void neonserv_cmd_unban_mask(struct neonserv_cmd_unban_cache *cache, char *mask); static void neonserv_cmd_unban_finish(struct neonserv_cmd_unban_cache *cache); -static CMD_BIND(neonserv_cmd_unban) { +CMD_BIND(neonserv_cmd_unban) { char *mask, *nextmask; struct ModeBuffer *modeBuf; modeBuf = initModeBuffer(client, chan); diff --git a/cmd_neonserv_unbanall.c b/cmd_neonserv_unbanall.c index c59576d..1be8251 100644 --- a/cmd_neonserv_unbanall.c +++ b/cmd_neonserv_unbanall.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nothing */ -static CMD_BIND(neonserv_cmd_unbanall) { +CMD_BIND(neonserv_cmd_unbanall) { struct ModeBuffer *modeBuf; int bans = 0; struct BanNode *ban; diff --git a/cmd_neonserv_unbanme.c b/cmd_neonserv_unbanme.c index 0ad6304..808a46f 100644 --- a/cmd_neonserv_unbanme.c +++ b/cmd_neonserv_unbanme.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nothing */ -static CMD_BIND(neonserv_cmd_unbanme) { +CMD_BIND(neonserv_cmd_unbanme) { struct ModeBuffer *modeBuf; int bans = 0; struct BanNode *ban; diff --git a/cmd_neonserv_unbind.c b/cmd_neonserv_unbind.c index db91274..bc67b83 100644 --- a/cmd_neonserv_unbind.c +++ b/cmd_neonserv_unbind.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * argv[0] command name */ -static CMD_BIND(neonserv_cmd_unbind) { +CMD_BIND(neonserv_cmd_unbind) { MYSQL_RES *res; MYSQL_ROW row; printf_mysql_query("SELECT `id` FROM `bot_binds` WHERE `botclass` = '%d' AND `command` = '%s'", client->botid, escape_string(argv[0])); diff --git a/cmd_neonserv_unregister.c b/cmd_neonserv_unregister.c index e87cefb..8da366e 100644 --- a/cmd_neonserv_unregister.c +++ b/cmd_neonserv_unregister.c @@ -1,8 +1,10 @@ +#include "cmd_neonserv.h" + /* * argv[0] - channel */ -static CMD_BIND(neonserv_cmd_unregister) { +CMD_BIND(neonserv_cmd_unregister) { MYSQL_RES *res; MYSQL_ROW row; char *channel = argv[0]; diff --git a/cmd_neonserv_unsuspend.c b/cmd_neonserv_unsuspend.c index e295595..c9d5aca 100644 --- a/cmd_neonserv_unsuspend.c +++ b/cmd_neonserv_unsuspend.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth */ @@ -13,7 +15,7 @@ struct neonserv_cmd_unsuspend_cache { char *nick; }; -static CMD_BIND(neonserv_cmd_unsuspend) { +CMD_BIND(neonserv_cmd_unsuspend) { if(argv[0][0] == '*') { //we've got an auth argv[0]++; diff --git a/cmd_neonserv_up.c b/cmd_neonserv_up.c index 991a9b3..a81de4a 100644 --- a/cmd_neonserv_up.c +++ b/cmd_neonserv_up.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * no arguments */ -static CMD_BIND(neonserv_cmd_up) { +CMD_BIND(neonserv_cmd_up) { struct ChanUser *chanuser = getChanUser(user, chan); if(!chanuser) { reply(getTextBot(), user, "NS_NOT_ON_CHANNEL_YOU", chan->name); diff --git a/cmd_neonserv_upall.c b/cmd_neonserv_upall.c index 9459acf..bea9325 100644 --- a/cmd_neonserv_upall.c +++ b/cmd_neonserv_upall.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * no arguments */ -static CMD_BIND(neonserv_cmd_upall) { +CMD_BIND(neonserv_cmd_upall) { MYSQL_RES *res, *default_res; MYSQL_ROW row, default_row; struct ChanUser *chanuser; diff --git a/cmd_neonserv_users.c b/cmd_neonserv_users.c index 0ef88b6..7834575 100644 --- a/cmd_neonserv_users.c +++ b/cmd_neonserv_users.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - usermask * argv[1] - min access @@ -15,7 +17,7 @@ struct neonserv_cmd_users_cache { int max_access; }; -static CMD_BIND(neonserv_cmd_users) { +CMD_BIND(neonserv_cmd_users) { int min_access = 1, max_access = 500; char *usermask = NULL; if(argc > 0) diff --git a/cmd_neonserv_uset.c b/cmd_neonserv_uset.c index 730ac40..354c08b 100644 --- a/cmd_neonserv_uset.c +++ b/cmd_neonserv_uset.c @@ -1,5 +1,7 @@ -static CMD_BIND(neonserv_cmd_uset) { +#include "cmd_neonserv.h" + +CMD_BIND(neonserv_cmd_uset) { MYSQL_RES *res; MYSQL_ROW row; loadUserSettings(user); diff --git a/cmd_neonserv_version.c b/cmd_neonserv_version.c index d4a6450..ed33d09 100644 --- a/cmd_neonserv_version.c +++ b/cmd_neonserv_version.c @@ -1,9 +1,11 @@ +#include "cmd_neonserv.h" + /* * no args */ -static CMD_BIND(neonserv_cmd_version) { +CMD_BIND(neonserv_cmd_version) { reply(getTextBot(), user, "\002NeonServ " NEONSERV_VERSION "\002 (%s), written by pk910", (strcmp(revision, "") ? revision : "-")); reply(getTextBot(), user, "Build (#%s) %s (%s lines, " COMPILER ")", compilation, creation, codelines); reply(getTextBot(), user, "NeonServ source can be found on: http://git.pk910.de/?p=NeonServV5.git"); diff --git a/cmd_neonserv_voice.c b/cmd_neonserv_voice.c index 611c352..45a78a9 100644 --- a/cmd_neonserv_voice.c +++ b/cmd_neonserv_voice.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0-*] nicks */ @@ -12,7 +14,7 @@ struct neonserv_cmd_voice_cache { char *nicks; }; -static CMD_BIND(neonserv_cmd_voice) { +CMD_BIND(neonserv_cmd_voice) { struct neonserv_cmd_voice_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_voiceall.c b/cmd_neonserv_voiceall.c index 0377310..e4de009 100644 --- a/cmd_neonserv_voiceall.c +++ b/cmd_neonserv_voiceall.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] (optional) nick mask */ @@ -12,7 +14,7 @@ struct neonserv_cmd_voiceall_cache { char *nickmask; }; -static CMD_BIND(neonserv_cmd_voiceall) { +CMD_BIND(neonserv_cmd_voiceall) { struct neonserv_cmd_voiceall_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); diff --git a/cmd_neonserv_wipeinfo.c b/cmd_neonserv_wipeinfo.c index 8fc1514..81378d6 100644 --- a/cmd_neonserv_wipeinfo.c +++ b/cmd_neonserv_wipeinfo.c @@ -1,4 +1,6 @@ +#include "cmd_neonserv.h" + /* * argv[0] - nick / *auth */ @@ -13,7 +15,7 @@ struct neonserv_cmd_wipeinfo_cache { char *nick; }; -static CMD_BIND(neonserv_cmd_wipeinfo) { +CMD_BIND(neonserv_cmd_wipeinfo) { if(argv[0][0] == '*') { //we've got an auth argv[0]++;