struct storedhook {
CommandHandler old;
sstring *name;
- char *oldhelp;
- char *newhelp;
+ cmdhelp *oldhelp;
+ cmdhelp *newhelp;
struct storedhook *next;
} storedhook;
UserMessageHandler oldhandler;
ControlMsg oldreply;
ControlWall oldwall;
+ControlPermitted oldpermitted;
void noperserv_trap_registration(int hooknum, void *arg);
int noperserv_showcommands(void *sender, int cargc, char **cargv);
void noperserv_whois_handler(int hooknum, void *arg);
void noperserv_whois_account_handler(int hooknum, void *arg);
void noperserv_handle_messages(nick *target, int messagetype, void **args);
-void noperserv_reply(nick *np, char *format, ...);
+void noperserv_reply(nick *np, char *format, ...) __attribute__ ((format (printf, 2, 3)));
void noperserv_wall(flag_t permissionlevel, flag_t noticelevel, char *format, ...);
struct specialsched special;
oldwall = controlwall;
controlwall = &noperserv_wall;
+ oldpermitted = controlpermitted;
+ controlpermitted = &noperserv_policy_command_permitted;
+
memset(&special, 0, sizeof(struct specialsched));
if(!mynick) {
newhook->old = fetchcommand->handler;
if(newhelp) {
- int len = strlen(newhelp) + 1;
- newhook->newhelp = (char *)malloc(len);
+ newhook->newhelp = (cmdhelp *)malloc(sizeof(cmdhelp));
+ memset(newhook->newhelp,0,sizeof(cmdhelp));
if(!newhook->newhelp) {
freesstring(newhook->name);
free(newhook);
+ } else {
+ int len = strlen(newhelp) + 1;
+ newhook->newhelp->helpstr = (char *)malloc(len);
+ if (newhook->newhelp->helpstr) {
+ strlcpy(newhook->newhelp->helpstr, newhelp, len);
+ }
+ newhook->oldhelp = fetchcommand->ext;
+ fetchcommand->ext = newhook->newhelp;
}
- strlcpy(newhook->newhelp, newhelp, len);
- newhook->oldhelp = fetchcommand->help;
- fetchcommand->help = newhook->newhelp;
} else {
newhook->newhelp = NULL;
}
if(ch->old && (fetchcommand = findcommandintree(controlcmds, ch->name->content, 1))) {
fetchcommand->handler = ch->old;
if(ch->newhelp) {
- fetchcommand->help = ch->oldhelp;
+ fetchcommand->ext = ch->oldhelp;
+ if ( ((cmdhelp *)ch->newhelp)->helpstr)
+ free( ((cmdhelp *)ch->newhelp)->helpstr);
free(ch->newhelp);
}
}
firsttime = 0;
}
- if(oldhandler)
+ if(oldhandler && mynick)
hooklocaluserhandler(mynick, oldhandler);
controlwall = oldwall;
controlreply = oldreply;
+ controlpermitted = oldpermitted;
}
void noperserv_trap_registration(int hooknum, void *arg) {
+ nick *np = (nick *)arg;
+ if(!np)
+ return;
+
oldhandler = hooklocaluserhandler((nick *)arg, &noperserv_handle_messages);
if(!oldhandler)
return;
int i;
char *ptr;
- for(i=0,ptr=lsmod(i);ptr;ptr=lsmod(++i))
+ for(i=0,ptr=lsmod(i,NULL,NULL,NULL);ptr;ptr=lsmod(++i,NULL,NULL,NULL))
if(match2strings(mask, ptr))
return 1;