HELPMOD2: don't ignore +h clients

[irc/quakenet/newserv.git] / chanserv / newsearch / interface.c

diff --git a/chanserv/newsearch/interface.c b/chanserv/newsearch/interface.c
index eefd67518bfa83fdba166dec515b1b243f5cce90..6eaa036bfe51da8be3dd61c05eaf3e1cc9efdc4f 100644 (file)
--- a/chanserv/newsearch/interface.c
+++ b/chanserv/newsearch/interface.c
@@ -1,8 +1,24 @@
 #include "../chanserv.h"
+#include "../../lib/stringbuf.h"
 #include "chanserv_newsearch.h"
 #include <stdio.h>
 #include <stdarg.h>
 
+static char *concatargs(int cargc, char **cargv) {
+  static char bigbuf[1024];
+  StringBuf b;
+  int i;
+
+  sbinit(&b, bigbuf, sizeof(bigbuf));
+  for(i=0;i<cargc;i++) {
+    sbaddstr(&b, cargv[i]);
+    sbaddchar(&b, ' ');
+  }
+  sbterminate(&b);
+
+  return bigbuf;
+}
+
 static void chanservmessagewrapper(nick *np, char *format, ...) {
   char buf[1024];
   va_list ap;
@@ -33,6 +49,7 @@ int cs_donicksearch(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
+  cs_log(source, "NICKSEARCH %s", concatargs(cargc, cargv));
   do_nicksearch_real(chanservmessagewrapper, chanservwallwrapper, source, cargc, cargv);
 
   chanservstdmessage(sender, QM_DONE);  
@@ -47,6 +64,7 @@ int cs_dochansearch(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
+  cs_log(source, "CHANSEARCH %s", concatargs(cargc, cargv));
   do_chansearch_real(chanservmessagewrapper, chanservwallwrapper, source, cargc, cargv);
 
   chanservstdmessage(sender, QM_DONE);  
@@ -61,6 +79,7 @@ int cs_dousersearch(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
+  cs_log(source, "USERSEARCH %s", concatargs(cargc, cargv));
   do_usersearch_real(chanservmessagewrapper, chanservwallwrapper, source, cargc, cargv);
 
   chanservstdmessage(sender, QM_DONE);  
@@ -74,20 +93,28 @@ void showheader(void *source, void *header) {
 }
 
 int cs_dospewemail(void *source, int cargc, char **cargv) {
-  searchASTExpr *tree;
+  searchASTExpr tree;
 
-  if(cargc < 1)
-    return CMD_USAGE;
+  if(cargc < 1) {
+    chanservstdmessage(source, QM_NOTENOUGHPARAMS, "spewemail");
+    return CMD_ERROR;
+  }
+
+  cs_log(source, "SPEWEMAIL %s", cargv[0]);
 
   tree = NSASTNode(match_parse, NSASTNode(qemail_parse), NSASTLiteral(cargv[0]));
-  return ast_usersearch(tree, chanservmessagewrapper, source, chanservwallwrapper, printauth, showheader, (void *)QM_SPEWHEADER, 2000);
+  return ast_usersearch(&tree, chanservmessagewrapper, source, chanservwallwrapper, printauth, showheader, (void *)QM_SPEWHEADER, 2000, NULL);
 }
 
 int cs_dospewdb(void *source, int cargc, char **cargv) {
-  searchASTExpr *tree;
+  searchASTExpr tree;
+
+  if(cargc < 1) {
+    chanservstdmessage(source, QM_NOTENOUGHPARAMS, "spewdb");
+    return CMD_ERROR;
+  }
 
-  if(cargc < 1)
-    return CMD_USAGE;
+  cs_log(source, "SPEWDB %s", cargv[0]);
 
   tree =
     NSASTNode(or_parse,
@@ -96,6 +123,6 @@ int cs_dospewdb(void *source, int cargc, char **cargv) {
       NSASTNode(match_parse, NSASTNode(qemail_parse), NSASTLiteral(cargv[0])),
       NSASTNode(match_parse, NSASTNode(qlasthost_parse), NSASTLiteral(cargv[0])),
     );
-  return ast_usersearch(tree, chanservmessagewrapper, source, chanservwallwrapper, printauth, showheader, (void *)QM_SPEWHEADER, 2000);
+  return ast_usersearch(&tree, chanservmessagewrapper, source, chanservwallwrapper, printauth, showheader, (void *)QM_SPEWHEADER, 2000, NULL);
 }