X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/7a8355d18321b334f8fddb03f332120e03e3f6ef..80e32fcd996025093c28b304d91d376b72c1496e:/newsearch/newsearch.c diff --git a/newsearch/newsearch.c b/newsearch/newsearch.c index 68785cfb..0b08bdfb 100644 --- a/newsearch/newsearch.c +++ b/newsearch/newsearch.c @@ -12,6 +12,7 @@ #include "../lib/strlfunc.h" #include "../lib/array.h" #include "newsearch.h" +#include "parser.h" MODULE_VERSION(""); @@ -21,6 +22,7 @@ searchList *globalterms = NULL; int do_nicksearch(void *source, int cargc, char **cargv); int do_chansearch(void *source, int cargc, char **cargv); int do_usersearch(void *source, int cargc, char **cargv); +int do_whowassearch(void *source, int cargc, char **cargv); void printnick_channels(searchCtx *, nick *, nick *); void printchannel(searchCtx *, nick *, chanindex *); @@ -30,9 +32,11 @@ void printchannel_services(searchCtx *, nick *, chanindex *); UserDisplayFunc defaultuserfn = printuser; NickDisplayFunc defaultnickfn = printnick; ChanDisplayFunc defaultchanfn = printchannel; +WhowasDisplayFunc defaultwhowasfn = printwhowas; -searchCmd *reg_nicksearch, *reg_chansearch, *reg_usersearch; +searchCmd *reg_nicksearch, *reg_chansearch, *reg_usersearch, *reg_whowassearch; void displaycommandhelp(nick *, Command *); +void displaystrerror(replyFunc, nick *, const char *); searchCmd *registersearchcommand(char *name, int level, CommandHandler cmd, void *defaultdisplayfunc) { searchCmd *acmd; @@ -53,7 +57,7 @@ searchCmd *registersearchcommand(char *name, int level, CommandHandler cmd, void addcommandtotree(searchCmdTree, name, 0, 0, (CommandHandler)acmd); for (sl=globalterms; sl; sl=sl->next) { - registersearchterm( acmd, sl->name->content, sl->cmd, 0, sl->help); + addcommandexttotree(acmd->searchtree, sl->name->content, 0, 1, (CommandHandler)sl->cmd, sl->help); } return acmd; @@ -63,6 +67,7 @@ void deregistersearchcommand(searchCmd *scmd) { deregistercontrolcmd(scmd->name->content, (CommandHandler)scmd->handler); destroycommandtree(scmd->outputtree); destroycommandtree(scmd->searchtree); + deletecommandfromtree(searchCmdTree, scmd->name->content, (CommandHandler) scmd); freesstring(scmd->name); free(scmd); } @@ -156,6 +161,7 @@ void _init() { reg_nicksearch = (searchCmd *)registersearchcommand("nicksearch",NO_OPER,&do_nicksearch, printnick); reg_chansearch = (searchCmd *)registersearchcommand("chansearch",NO_OPER,&do_chansearch, printchannel); reg_usersearch = (searchCmd *)registersearchcommand("usersearch",NO_OPER,&do_usersearch, printuser); + reg_whowassearch = (searchCmd *)registersearchcommand("whowassearch",NO_OPER,&do_whowassearch, printwhowas); /* Boolean operations */ registerglobalsearchterm("and",and_parse, "usage: (and (X) (X))" ); @@ -173,19 +179,47 @@ void _init() { registerglobalsearchterm("length",length_parse, "usage: (length string)"); /* Nickname operations */ - registersearchterm(reg_nicksearch, "hostmask",hostmask_parse, 0, "The user's nick!user@host; \"hostmask real\" returns nick!user@host\rreal"); /* nick only */ + registersearchterm(reg_nicksearch, "hostmask",hostmask_parse, 0, "The user's nick!user@host; \"hostmask real\" returns nick!user@host\rreal"); + registersearchterm(reg_whowassearch, "hostmask",hostmask_parse, 0, "The user's nick!user@host; \"hostmask real\" returns nick!user@host\rreal"); + registersearchterm(reg_nicksearch, "realname",realname_parse, 0, "User's current realname"); /* nick only */ - registersearchterm(reg_nicksearch, "authname",authname_parse, 0, "User's current authname or false"); /* nick only */ - registersearchterm(reg_nicksearch, "authts",authts_parse, 0, "User's Auth timestamp"); /* nick only */ - registersearchterm(reg_nicksearch, "ident",ident_parse, 0, "User's current ident"); /* nick only */ - registersearchterm(reg_nicksearch, "host",host_parse, 0, "User's host, allow \"host real\" to match real host"); /* nick only */ + registersearchterm(reg_whowassearch, "realname",realname_parse, 0, "User's current realname"); /* nick only */ + + registersearchterm(reg_nicksearch, "away",away_parse, 0, "User's current away message"); + registersearchterm(reg_whowassearch, "away",away_parse, 0, "User's current away message"); + registersearchterm(reg_nicksearch, "authname",authname_parse, 0, "User's current authname or false"); + registersearchterm(reg_whowassearch, "authname",authname_parse, 0, "User's current authname or false"); + registersearchterm(reg_nicksearch, "authts",authts_parse, 0, "User's Auth timestamp"); + registersearchterm(reg_whowassearch, "authts",authts_parse, 0, "User's Auth timestamp"); + registersearchterm(reg_nicksearch, "ident",ident_parse, 0, "User's current ident"); + registersearchterm(reg_whowassearch, "ident",ident_parse, 0, "User's current ident"); + registersearchterm(reg_nicksearch, "host",host_parse, 0, "User's host, allow \"host real\" to match real host"); + registersearchterm(reg_whowassearch, "host",host_parse, 0, "User's host, allow \"host real\" to match real host"); registersearchterm(reg_nicksearch, "channel",channel_parse, 0, "Valid Channel Name to match users against"); /* nick only */ - registersearchterm(reg_nicksearch, "timestamp",timestamp_parse, 0, "User's Timestamp"); /* nick only */ - registersearchterm(reg_nicksearch, "country",country_parse, 0, "2 letter country code (data source is geoip)"); /* nick only */ - registersearchterm(reg_nicksearch, "ip",ip_parse, 0, "User's IP - ipv4 or ipv6 format as appropriate. Note: not 6to4"); /* nick only */ + registersearchterm(reg_nicksearch, "timestamp",timestamp_parse, 0, "User's Timestamp"); + registersearchterm(reg_whowassearch, "timestamp",timestamp_parse, 0, "User's Timestamp"); + registersearchterm(reg_nicksearch, "country",country_parse, 0, "2 letter country code (data source is geoip)"); + registersearchterm(reg_nicksearch, "ip",ip_parse, 0, "User's IP - ipv4 or ipv6 format as appropriate. Note: not 6to4"); + registersearchterm(reg_whowassearch, "ip",ip_parse, 0, "User's IP - ipv4 or ipv6 format as appropriate. Note: not 6to4"); registersearchterm(reg_nicksearch, "channels",channels_parse, 0, "Channel Count"); /* nick only */ - registersearchterm(reg_nicksearch, "server",server_parse, 0, "Server Name. Either (server string) or (match (server) string)"); /* nick only */ - registersearchterm(reg_nicksearch, "authid",authid_parse, 0, "User's Auth ID"); /* nick only */ + registersearchterm(reg_nicksearch, "server",server_parse, 0, "Server Name. Either (server string) or (match (server) string)"); + registersearchterm(reg_whowassearch, "server",server_parse, 0, "Server Name. Either (server string) or (match (server) string)"); + registersearchterm(reg_whowassearch, "server",server_parse, 0, "Server Name. Either (server string) or (match (server) string)"); + registersearchterm(reg_nicksearch, "authid",authid_parse, 0, "User's Auth ID"); + registersearchterm(reg_whowassearch, "authid",authid_parse, 0, "User's Auth ID"); + registersearchterm(reg_nicksearch, "cidr",cidr_parse, 0, "CIDR matching"); + registersearchterm(reg_whowassearch, "cidr",cidr_parse, 0, "CIDR matching"); + registersearchterm(reg_nicksearch, "ipvsix",ipv6_parse, 0, "IPv6 user"); + registersearchterm(reg_whowassearch, "ipvsix",ipv6_parse, 0, "IPv6 user"); + registersearchterm(reg_nicksearch, "message",message_parse, 0, "Last message"); + + /* Whowas operations */ + registersearchterm(reg_whowassearch, "quit",quit_parse, 0, "User quit"); + registersearchterm(reg_whowassearch, "killed",killed_parse, 0, "User was killed"); + registersearchterm(reg_whowassearch, "renamed",renamed_parse, 0, "User changed nick"); + registersearchterm(reg_whowassearch, "age",age_parse, 0, "Whowas record age in seconds"); + registersearchterm(reg_whowassearch, "newnick",newnick_parse, 0, "New nick (for rename whowas records)"); + registersearchterm(reg_whowassearch, "reason",reason_parse, 0, "Quit/kill reason"); /* Channel operations */ registersearchterm(reg_chansearch, "exists",exists_parse, 0, "Returns if channel exists on network. Note: newserv may store data on empty channels"); /* channel only */ @@ -194,21 +228,26 @@ void _init() { registersearchterm(reg_chansearch, "name",name_parse, 0, "Channel Name"); /* channel only */ registersearchterm(reg_chansearch, "topic",topic_parse, 0, "Channel topic"); /* channel only */ registersearchterm(reg_chansearch, "oppct",oppct_parse, 0, "Percentage Opped"); /* channel only */ + registersearchterm(reg_chansearch, "cumodecount",cumodecount_parse, 0, "Count of users with given channel modes"); /* channel only */ + registersearchterm(reg_chansearch, "cumodepct",cumodepct_parse, 0, "Percentage of users with given channel modes"); /* channel only */ registersearchterm(reg_chansearch, "uniquehostpct",hostpct_parse, 0, "uniquehost percent"); /* channel only */ registersearchterm(reg_chansearch, "authedpct",authedpct_parse, 0, "Percentage of authed users"); /* channel only */ registersearchterm(reg_chansearch, "kick",kick_parse, 0, "KICK users channels in newsearch result. Note: evaluation order"); /* channel only */ /* Nickname / channel operations */ - registersearchterm(reg_chansearch, "modes",modes_parse, 0, "User Modes"); - registersearchterm(reg_nicksearch, "modes",modes_parse, 0, "Channel Modes"); + registersearchterm(reg_chansearch, "modes",modes_parse, 0, "Channel Modes"); + registersearchterm(reg_nicksearch, "modes",modes_parse, 0, "User Modes"); + registersearchterm(reg_whowassearch, "modes",modes_parse, 0, "User Modes"); registersearchterm(reg_chansearch, "nick",nick_parse, 0, "Nickname"); registersearchterm(reg_nicksearch, "nick",nick_parse, 0, "Nickname"); + registersearchterm(reg_whowassearch, "nick",nick_parse, 0, "Nickname"); /* Kill / gline parameters */ registersearchterm(reg_chansearch,"kill",kill_parse, 0, "KILL users in newsearch result. Note: evaluation order"); registersearchterm(reg_chansearch,"gline",gline_parse, 0, "GLINE users in newsearch result. Note: evaluation order"); registersearchterm(reg_nicksearch,"kill",kill_parse, 0, "KILL users in newsearch result. Note: evaluation order"); registersearchterm(reg_nicksearch,"gline",gline_parse, 0, "GLINE users in newsearch result. Note: evaluation order"); + registersearchterm(reg_whowassearch,"gline",gline_parse, 0, "GLINE users in newsearch result. Note: evaluation order"); /* Iteration functionality */ registerglobalsearchterm("any",any_parse, "usage: any (generatorfn x) (fn ... (var x) ...)"); @@ -217,7 +256,12 @@ void _init() { /* Iterable functions */ registersearchterm(reg_nicksearch, "channeliter",channeliter_parse, 0, "Channel Iterable function - usage: (any (channeliter x) (match (var x) #twilight*))"); /* nick only */ - + registersearchterm(reg_chansearch, "nickiter",nickiter_parse, 0, "Nick Iterable function - usage: (any (nickiter x) (match (var x) nickname*))"); /* channel only */ + + /* Functions that work on strings?! */ + registersearchterm(reg_nicksearch, "cumodes", cumodes_parse, 0, "usage: (cumodes (var x) )"); + registersearchterm(reg_chansearch, "cumodes", cumodes_parse, 0, "usage: (cumodes (var x) )"); + /* Notice functionality */ registersearchterm(reg_chansearch,"notice",notice_parse, 0, "NOTICE users in newsearch result. Note: evaluation order"); registersearchterm(reg_nicksearch,"notice",notice_parse, 0, "NOTICE users in newsearch result. Note: evaluation order"); @@ -349,7 +393,7 @@ static void controlwallwrapper(int level, char *format, ...) { va_end(ap); } -int parseopts(int cargc, char **cargv, int *arg, int *limit, void **subset, void **display, CommandTree *sl, replyFunc reply, void *sender) { +int parseopts(int cargc, char **cargv, int *arg, int *limit, void **subset, void *display, CommandTree *sl, replyFunc reply, void *sender) { char *ch; Command *cmd; struct irc_in_addr sin; unsigned char bits; @@ -382,11 +426,15 @@ int parseopts(int cargc, char **cargv, int *arg, int *limit, void **subset, void reply(sender,"Error: Access Denied for output format %s (for help, see help )", cargv[*arg]); return CMD_ERROR; } - *display=(void *)cmd->handler; + *((void **)display)=(void *)cmd->handler; (*arg)++; break; case 's': + if (subset == NULL) { + reply(sender,"Error: -s switch not supported for this search."); + return CMD_ERROR; + } if (cargc<*arg) { reply(sender,"Error: -s switch requires an argument (for help, see help )"); return CMD_ERROR; @@ -409,7 +457,7 @@ int parseopts(int cargc, char **cargv, int *arg, int *limit, void **subset, void return CMD_OK; } -void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *np) { +void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *np, void *displayfn, int limit, void *target) { memset(ctx, 0, sizeof(searchCtx)); ctx->reply = replyfn; @@ -418,16 +466,18 @@ void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc reply ctx->arg = arg; ctx->searchcmd = cmd; ctx->sender = np; + ctx->limit = limit; + ctx->target = target; + ctx->displayfn = displayfn; } int do_nicksearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv) { nick *sender = source; - struct searchNode *search; int limit=500; int arg=0; NickDisplayFunc display=defaultnickfn; - searchCtx ctx; int ret; + parsertree *tree; if (cargc<1) { reply( sender, "Usage: [flags] "); @@ -435,7 +485,7 @@ int do_nicksearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, return CMD_OK; } - ret = parseopts(cargc, cargv, &arg, &limit, NULL, (void **)&display, reg_nicksearch->outputtree, reply, sender); + ret = parseopts(cargc, cargv, &arg, &limit, NULL, (void *)&display, reg_nicksearch->outputtree, reply, sender); if(ret != CMD_OK) return ret; @@ -448,16 +498,15 @@ int do_nicksearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, rejoinline(cargv[arg],cargc-arg); } - newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_nicksearch, sender); - - if (!(search = ctx.parser(&ctx, cargv[arg]))) { - reply(sender,"Parse error: %s",parseError); + tree = parse_string(reg_nicksearch, cargv[arg]); + if(!tree) { + displaystrerror(reply, sender, cargv[arg]); return CMD_ERROR; } - nicksearch_exe(search, &ctx, sender, display, limit); + ast_nicksearch(tree->root, reply, sender, wall, display, NULL, NULL, limit, NULL); - (search->free)(&ctx, search); + parse_free(tree); return CMD_OK; } @@ -466,15 +515,17 @@ int do_nicksearch(void *source, int cargc, char **cargv) { return do_nicksearch_real(controlreply, controlwallwrapper, source, cargc, cargv); } -void nicksearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, NickDisplayFunc display, int limit) { +void nicksearch_exe(struct searchNode *search, searchCtx *ctx) { int i, j; int matches = 0; unsigned int cmarker; unsigned int tchans=0,uchans=0; struct channel **cs; - nick *np; + nick *np, *sender = ctx->sender; senderNSExtern = sender; - + NickDisplayFunc display = ctx->displayfn; + int limit = ctx->limit; + /* Get a marker value to mark "seen" channels for unique count */ cmarker=nextchanmarker(); @@ -482,7 +533,7 @@ void nicksearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, Nic search=coerceNode(ctx, search, RETURNTYPE_BOOL); for (i=0;inext) { + for (np=ctx->target ? ctx->target : nicktable[i];np;np=np->next) { if ((search->exe)(ctx, search, np)) { /* Add total channels */ tchans += np->channels->cursi; @@ -503,21 +554,107 @@ void nicksearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, Nic ctx->reply(sender, "--- More than %d matches, skipping the rest",limit); matches++; } + + if (ctx->target) + goto done; } } +done: ctx->reply(sender,"--- End of list: %d matches; users were on %u channels (%u unique, %.1f average clones)", matches, tchans, uchans, (float)tchans/uchans); +} + +int do_whowassearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv) { + nick *sender = source; + int limit=500; + int arg=0; + WhowasDisplayFunc display=defaultwhowasfn; + int ret; + parsertree *tree; + + if (cargc<1) { + reply( sender, "Usage: [flags] "); + reply( sender, "For help, see help whowassearch"); + return CMD_OK; + } + + ret = parseopts(cargc, cargv, &arg, &limit, NULL, (void *)&display, reg_whowassearch->outputtree, reply, sender); + if(ret != CMD_OK) + return ret; + + if (arg>=cargc) { + reply(sender,"No search terms - aborting."); + return CMD_ERROR; + } + + if (arg<(cargc-1)) { + rejoinline(cargv[arg],cargc-arg); + } + + tree = parse_string(reg_whowassearch, cargv[arg]); + if(!tree) { + displaystrerror(reply, sender, cargv[arg]); + return CMD_ERROR; + } + + ast_whowassearch(tree->root, reply, sender, wall, display, NULL, NULL, limit, NULL); + + parse_free(tree); + + return CMD_OK; +} + +int do_whowassearch(void *source, int cargc, char **cargv) { + return do_whowassearch_real(controlreply, controlwallwrapper, source, cargc, cargv); +} + +void whowassearch_exe(struct searchNode *search, searchCtx *ctx) { + int i, matches = 0; + whowas *ww; + nick *sender = ctx->sender; + senderNSExtern = sender; + WhowasDisplayFunc display = ctx->displayfn; + int limit = ctx->limit; + + /* The top-level node needs to return a BOOL */ + search=coerceNode(ctx, search, RETURNTYPE_BOOL); + + for (i = whowasoffset; i < whowasoffset + WW_MAXENTRIES; i++) { + if (ctx->target) { + ww = ctx->target; + } else { + ww = &whowasrecs[i % WW_MAXENTRIES]; + + if (ww->type == WHOWAS_UNUSED) + continue; + } + + /* Note: We're passing the nick to the filter function. The original + * whowas record is in the nick's ->next field. */ + if ((search->exe)(ctx, search, &ww->nick)) { + if (matchesreply(sender, "--- More than %d matches, skipping the rest",limit); + matches++; + } + + if (ctx->target) + break; + } + + ctx->reply(sender,"--- End of list: %d matches", matches); } int do_chansearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv) { nick *sender = source; - struct searchNode *search; int limit=500; int arg=0; ChanDisplayFunc display=defaultchanfn; - searchCtx ctx; int ret; + parsertree *tree; if (cargc<1) { reply( sender, "Usage: [flags] "); @@ -525,7 +662,7 @@ int do_chansearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, return CMD_OK; } - ret = parseopts(cargc, cargv, &arg, &limit, NULL, (void **)&display, reg_chansearch->outputtree, reply, sender); + ret = parseopts(cargc, cargv, &arg, &limit, NULL, (void *)&display, reg_chansearch->outputtree, reply, sender); if(ret != CMD_OK) return ret; @@ -538,15 +675,15 @@ int do_chansearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, rejoinline(cargv[arg],cargc-arg); } - newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_chansearch, sender); - if (!(search = ctx.parser(&ctx, cargv[arg]))) { - reply(sender,"Parse error: %s",parseError); + tree = parse_string(reg_chansearch, cargv[arg]); + if(!tree) { + displaystrerror(reply, sender, cargv[arg]); return CMD_ERROR; } - chansearch_exe(search, &ctx, sender, display, limit); + ast_chansearch(tree->root, reply, sender, wall, display, NULL, NULL, limit, NULL); - (search->free)(&ctx, search); + parse_free(tree); return CMD_OK; } @@ -555,37 +692,43 @@ int do_chansearch(void *source, int cargc, char **cargv) { return do_chansearch_real(controlreply, controlwallwrapper, source, cargc, cargv); } -void chansearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, ChanDisplayFunc display, int limit) { +void chansearch_exe(struct searchNode *search, searchCtx *ctx) { int i; chanindex *cip; int matches = 0; + nick *sender = ctx->sender; senderNSExtern = sender; + ChanDisplayFunc display = ctx->displayfn; + int limit = ctx->limit; search=coerceNode(ctx, search, RETURNTYPE_BOOL); for (i=0;inext) { + for (cip=ctx->target ? ctx->target : chantable[i];cip;cip=cip->next) { if ((search->exe)(ctx, search, cip)) { if (matchesreply(sender, "--- More than %d matches, skipping the rest",limit); matches++; + + if (ctx->target) + goto done; } } } +done: ctx->reply(sender,"--- End of list: %d matches", matches); } int do_usersearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv) { nick *sender = source; - struct searchNode *search; int limit=500; int arg=0; UserDisplayFunc display=defaultuserfn; - searchCtx ctx; int ret; + parsertree *tree; if (cargc<1) { reply( sender, "Usage: [flags] "); @@ -593,7 +736,7 @@ int do_usersearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, return CMD_OK; } - ret = parseopts(cargc, cargv, &arg, &limit, NULL, (void **)&display, reg_usersearch->outputtree, reply, sender); + ret = parseopts(cargc, cargv, &arg, &limit, NULL, (void *)&display, reg_usersearch->outputtree, reply, sender); if(ret != CMD_OK) return ret; @@ -606,16 +749,15 @@ int do_usersearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, rejoinline(cargv[arg],cargc-arg); } - newsearch_ctxinit(&ctx, search_parse, reply, wall, NULL, reg_usersearch, sender); - - if (!(search = ctx.parser(&ctx, cargv[arg]))) { - reply(sender,"Parse error: %s",parseError); + tree = parse_string(reg_usersearch, cargv[arg]); + if(!tree) { + displaystrerror(reply, sender, cargv[arg]); return CMD_ERROR; } - usersearch_exe(search, &ctx, sender, display, limit); + ast_usersearch(tree->root, reply, sender, wall, display, NULL, NULL, limit, NULL); - (search->free)(&ctx, search); + parse_free(tree); return CMD_OK; } @@ -624,16 +766,19 @@ int do_usersearch(void *source, int cargc, char **cargv) { return do_usersearch_real(controlreply, controlwallwrapper, source, cargc, cargv); } -void usersearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, UserDisplayFunc display, int limit) { +void usersearch_exe(struct searchNode *search, searchCtx *ctx) { int i; authname *aup; int matches = 0; + nick *sender = ctx->sender; + int limit = ctx->limit; + UserDisplayFunc display = ctx->displayfn; senderNSExtern = sender; - + search=coerceNode(ctx, search, RETURNTYPE_BOOL); for (i=0;inext) { + for (aup=ctx->target ? ctx->target : authnametable[i];aup;aup=aup->next) { if ((search->exe)(ctx, search, aup)) { if (matchesreply(sender, "--- More than %d matches, skipping the rest",limit); matches++; } + + if (ctx->target) + goto done; } } +done: ctx->reply(sender,"--- End of list: %d matches", matches); } @@ -872,140 +1021,6 @@ void literal_free(searchCtx *ctx, struct searchNode *thenode) { free(thenode); } -/* search_parse: - * Given an input string, return a searchNode. - */ - -struct searchNode *search_parse(searchCtx *ctx, char *input) { - /* OK, we need to split the input into chunks on spaces and brackets.. */ - char *argvector[100]; - char thestring[500]; - int i,j,q=0,e=0; - char *ch,*ch2; - struct Command *cmd; - struct searchNode *thenode; - - /* If it starts with a bracket, it's a function call.. */ - if (*input=='(') { - /* Skip past string */ - for (ch=input;*ch;ch++); - if (*(ch-1) != ')') { - parseError = "Bracket mismatch!"; - return NULL; - } - input++; - *(ch-1)='\0'; - - /* Split further args */ - i=-1; /* i = -1 BoW, 0 = inword, 1 = bracket nest depth */ - j=0; /* j = current arg */ - e=0; - q=0; - argvector[0]=""; - for (ch=input;*ch;ch++) { - if (i==-1) { - argvector[j]=ch; - if (*ch=='(') { - i=1; - } else if (*ch != ' ') { - i=0; - if (*ch=='\\') { - e=1; - } else if (*ch=='\"') { - q=1; - } - } - } else if (e==1) { - e=0; - } else if (q==1) { - if (*ch=='\"') - q=0; - } else if (i==0) { - if (*ch=='\\') { - e=1; - } else if (*ch=='\"') { - q=1; - } else if (*ch==' ') { - *ch='\0'; - j++; - if(j >= (sizeof(argvector) / sizeof(*argvector))) { - parseError = "Too many arguments"; - return NULL; - } - i=-1; - } - } else { - if (*ch=='\\') { - e=1; - } else if (*ch=='\"') { - q=1; - } else if (*ch=='(') { - i++; - } else if (*ch==')') { - i--; - } - } - } - - if (i>0) { - parseError = "Bracket mismatch!"; - return NULL; - } - - if (*(ch-1) == 0) /* if the last character was a space */ - j--; /* remove an argument */ - - if (!(cmd=findcommandintree(ctx->searchcmd->searchtree,argvector[0],1))) { - parseError = "Unknown command (for valid command list, see help )"; - return NULL; - } else { - if ( !controlpermitted( cmd->level, ctx->sender) ) { - parseError = "Access Denied (for valid command list, see help )"; - return NULL; - } - return ((parseFunc)cmd->handler)(ctx, j, argvector+1); - } - } else { - /* Literal */ - if (*input=='\"') { - for (ch=input;*ch;ch++); - - if (*(ch-1) != '\"') { - parseError="Quote mismatch"; - return NULL; - } - - *(ch-1)='\0'; - input++; - } - - ch2=thestring; - for (ch=input;*ch;ch++) { - if (e) { - e=0; - *ch2++=*ch; - } else if (*ch=='\\') { - e=1; - } else { - *ch2++=*ch; - } - } - *ch2='\0'; - - if (!(thenode=(struct searchNode *)malloc(sizeof(struct searchNode)))) { - parseError = "malloc: could not allocate memory for this search."; - return NULL; - } - - thenode->localdata = getsstring(thestring,512); - thenode->returntype = RETURNTYPE_CONST | RETURNTYPE_STRING; - thenode->exe = literal_exe; - thenode->free = literal_free; - - return thenode; - } -} - void nssnprintf(char *buf, size_t size, const char *format, nick *np) { StringBuf b; const char *p; @@ -1043,11 +1058,11 @@ void nssnprintf(char *buf, size_t size, const char *format, nick *np) { case 'h': c = np->host->name->content; break; case 'I': - snprintf(hostbuf, sizeof(hostbuf), "%s", IPtostr(np->p_ipaddr)); + snprintf(hostbuf, sizeof(hostbuf), "%s", IPtostr(np->ipaddress)); c = hostbuf; break; case 'u': - snprintf(hostbuf, sizeof(hostbuf), "%s!%s@%s", np->nick, np->ident, IPtostr(np->p_ipaddr)); + snprintf(hostbuf, sizeof(hostbuf), "%s!%s@%s", np->nick, np->ident, IPtostr(np->ipaddress)); c = hostbuf; break; default: @@ -1143,3 +1158,46 @@ searchNode *var_get(searchCtx *ctx, char *arg) { void var_setstr(struct searchVariable *v, char *data) { v->cdata.u.stringbuf = data; } + +void displaystrerror(replyFunc reply, nick *np, const char *input) { + char buf[515]; + + if((parseStrErrorPos >= 0) && (parseStrErrorPos < sizeof(buf) - 3)) { + int i; + + for(i=0;iparser(ctx, arg); + if (!(c = coerceNode(ctx, c, RETURNTYPE_STRING))) { + snprintf(errorbuf, sizeof(errorbuf), "%s: unable to coerce argument to string", command); + parseError = errorbuf; + return NULL; + } + + if (!(c->returntype & RETURNTYPE_CONST)) { + snprintf(errorbuf, sizeof(errorbuf), "%s: constant argument required", command); + parseError = errorbuf; + (c->free)(ctx, c); + return NULL; + } + + if(p) + *p = (char *)(c->exe)(ctx, c, NULL); + + return c; +}