nickwatch: Add hook for HOOK_NICK_ACCOUNT.

[irc/quakenet/newserv.git] / newsearch / ns-modes.c

diff --git a/newsearch/ns-modes.c b/newsearch/ns-modes.c
index 48042917614fe5d97b7608bb7f76f2fcfb7ed540..ca29fa424ec3c901dba3591caf80b789efbf6b52 100644 (file)
--- a/newsearch/ns-modes.c
+++ b/newsearch/ns-modes.c
@@ -17,9 +17,10 @@ void modes_free(searchCtx *ctx, struct searchNode *thenode);
 
 struct searchNode *modes_parse(searchCtx *ctx, int argc, char **argv) {
   struct modes_localdata *localdata;
-  struct searchNode *thenode;
+  struct searchNode *thenode, *modestring;
   const flag *flaglist;
-
+  char *p;
+  
   if (argc!=1) {
     parseError="modes: usage: modes (mode string)";
     return NULL;
@@ -27,7 +28,7 @@ struct searchNode *modes_parse(searchCtx *ctx, int argc, char **argv) {
     
   if (ctx->searchcmd == reg_chansearch) {
     flaglist=cmodeflags;
-  } else if (ctx->searchcmd == reg_nicksearch) {
+  } else if (ctx->searchcmd == reg_nicksearch || ctx->searchcmd == reg_whowassearch) {
     flaglist=umodeflags;
   } else {
     parseError="modes: unsupported search type";
@@ -42,9 +43,15 @@ struct searchNode *modes_parse(searchCtx *ctx, int argc, char **argv) {
   localdata->setmodes=0;
   localdata->clearmodes = ~0;
   
-  setflags(&(localdata->setmodes), 0xFFFF, argv[0], flaglist, REJECT_NONE);
-  setflags(&(localdata->clearmodes), 0xFFFF, argv[0], flaglist, REJECT_NONE);
-
+  if (!(modestring=argtoconststr("modes", ctx, argv[0], &p))) {
+    free(localdata);
+    return NULL;
+  }
+  
+  setflags(&(localdata->setmodes), 0xFFFF, p, flaglist, REJECT_NONE);
+  setflags(&(localdata->clearmodes), 0xFFFF, p, flaglist, REJECT_NONE);
+  (modestring->free)(ctx, modestring);
+  
   localdata->clearmodes = ~(localdata->clearmodes);
   
   if (!(thenode=(struct searchNode *)malloc(sizeof(struct searchNode)))) {
@@ -75,7 +82,7 @@ void *modes_exe(searchCtx *ctx, struct searchNode *thenode, void *value) {
     if (!cip->channel)
       return NULL;
     flags=cip->channel->flags;
-  } else if (ctx->searchcmd == reg_nicksearch) {
+  } else if (ctx->searchcmd == reg_nicksearch || ctx->searchcmd == reg_whowassearch) {
     np=(nick *)value;
     flags=np->umodes;
   } else {