#include "../core/modules.h"
#include "../server/server.h"
-void *server_exe_bool(struct searchNode *thenode, void *theinput);
-void *server_exe_str(struct searchNode *thenode, void *theinput);
-void server_free(struct searchNode *thenode);
+void *server_exe_bool(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void *server_exe_str(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void server_free(searchCtx *ctx, struct searchNode *thenode);
int ext;
-struct searchNode *server_parse(int type, int argc, char **argv) {
+struct searchNode *server_parse(searchCtx *ctx, int argc, char **argv) {
struct searchNode *thenode;
int i;
long numeric;
- if (type != SEARCHTYPE_NICK) {
- parseError = "server: this function is only valid for nick searches.";
+ if (!(thenode=(struct searchNode *)malloc(sizeof (struct searchNode)))) {
+ parseError = "malloc: could not allocate memory for this search.";
return NULL;
}
if (argc>0) {
+ struct searchNode *servername;
+ char *p;
+
+ if (!(servername=argtoconststr("server", ctx, argv[0], &p))) {
+ free(thenode);
+ return NULL;
+ }
+
numeric = -1;
for(i=0;i<MAXSERVERS;i++) {
sstring *n = serverlist[i].name;
- if(n && !strcmp(n->content, argv[0])) {
+ if(n && !strcmp(n->content, p)) {
numeric = i;
break;
}
}
+ (servername->free)(ctx, servername);
+
if(numeric == -1) {
parseError = "server: server not found.";
+ free(thenode);
return NULL;
}
return thenode;
}
-void *server_exe_bool(struct searchNode *thenode, void *theinput) {
+void *server_exe_bool(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
nick *np = (nick *)theinput;
long server = (long)thenode->localdata;
return (void *)0;
}
-void *server_exe_str(struct searchNode *thenode, void *theinput) {
+void *server_exe_str(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
nick *np = (nick *)theinput;
sstring *n = serverlist[homeserver(np->numeric)].name;
return n->content;
}
-void server_free(struct searchNode *thenode) {
+void server_free(searchCtx *ctx, struct searchNode *thenode) {
free(thenode);
}