merge

[irc/quakenet/newserv.git] / control / control.h

diff --git a/control/control.h b/control/control.h
index 33ec8487239ee6d97353bf81a42f85322c76c937..517c99ae0b1b77e80b84612b1b53e7e1073b6f50 100644 (file)
--- a/control/control.h
+++ b/control/control.h
@@ -6,25 +6,15 @@
 #include "../nick/nick.h"
 #include "../channel/channel.h"
 
-void registercontrolhelpcmd(const char *name, int level, int maxparams, CommandHandler handler, char *help);
-int deregistercontrolcmd(const char *name, CommandHandler handler);
-void controlmessage(nick *target, char *message, ... ) __attribute__ ((format (printf, 2, 3)));
-void controlchanmsg(channel *cp, char *message, ...) __attribute__ ((format (printf, 2, 3)));
-void controlnotice(nick *target, char *message, ...) __attribute__ ((format (printf, 2, 3)));
-int controlshowcommands(void *sender, int cargc, char **cargv);
-int controlrmmod(void *sender, int cargc, char **cargv);
-void controlspecialrmmod(void *arg);
-void controlspecialreloadmod(void *arg);
-void controlhelp(nick *np, Command *cmd);
-void controlnswall(int noticelevel, char *format, ...) __attribute__ ((format (printf, 2, 3)));
-
 #define registercontrolcmd(a, b, c, d) registercontrolhelpcmd(a, b, c, d, NULL)
 
 typedef void (*ControlMsg)(nick *, char *, ... );
 typedef void (*ControlWall)(flag_t, flag_t, char *, ...);
+typedef int (*ControlPermitted)(flag_t, nick *);
 
 extern ControlMsg controlreply;
 extern ControlWall controlwall;
+extern ControlPermitted controlpermitted;
 
 extern nick *mynick;
 
@@ -35,6 +25,25 @@ struct specialsched {
   void *schedule;
 };
 
+typedef void (*CommandHelp)(nick *, Command *);
+typedef struct cmdhelp {
+  char *helpstr;
+  CommandHelp helpcmd;
+} cmdhelp;
+
+void registercontrolhelpcmd(const char *name, int level, int maxparams, CommandHandler handler, char *help);
+void registercontrolhelpfunccmd(const char *name, int level, int maxparams, CommandHandler handler, CommandHelp helpcmd);
+int deregistercontrolcmd(const char *name, CommandHandler handler);
+void controlmessage(nick *target, char *message, ... ) __attribute__ ((format (printf, 2, 3)));
+void controlchanmsg(channel *cp, char *message, ...) __attribute__ ((format (printf, 2, 3)));
+void controlnotice(nick *target, char *message, ...) __attribute__ ((format (printf, 2, 3)));
+int controlshowcommands(void *sender, int cargc, char **cargv);
+int controlrmmod(void *sender, int cargc, char **cargv);
+void controlspecialrmmod(void *arg);
+void controlspecialreloadmod(void *arg);
+void controlhelp(nick *np, Command *cmd);
+void controlnswall(int noticelevel, char *format, ...) __attribute__ ((format (printf, 2, 3)));
+
 /* NEVER USE THE FOLLOWING IN COMMANDS, you'll end up missing bits off and users'll end up being able to gline people */
 #define __NO_ANYONE      0x000
 #define __NO_AUTHED      0x001 /* must be authed with the network, don't know what use this is really */