struct searchNode *gline_parse(searchCtx *ctx, int argc, char **argv) {
struct gline_localdata *localdata;
struct searchNode *thenode;
- int len;
- char *p;
if (!(localdata = (struct gline_localdata *) malloc(sizeof(struct gline_localdata)))) {
parseError = "malloc: could not allocate memory for this search.";
else if (ctx->searchcmd == reg_nicksearch)
localdata->marker = nextnickmarker();
else {
+ free(localdata);
parseError = "gline: invalid search type";
return NULL;
}
- switch (argc) {
- case 0:
+ /* default duration, default reason */
+ if(argc == 0) {
localdata->duration = NSGLINE_DURATION;
strlcpy(localdata->reason, defaultreason, sizeof(localdata->reason));
- break;
-
- case 1:
- if (strchr(argv[0], ' ') == NULL) { /* duration specified */
- localdata->duration = durationtolong(argv[0]);
- /* error checking on gline duration */
- if (localdata->duration == 0)
- localdata->duration = NSGLINE_DURATION;
- strlcpy(localdata->reason, defaultreason, sizeof(localdata->reason));
+ } else if(argc > 2) {
+ free(localdata);
+ parseError = "gline: invalid number of arguments";
+ return NULL;
+ } else {
+ char *argzerop, *reasonp, *durationp;
+ struct searchNode *durationsn, *reasonsn, *argzerosn;
+
+ if (!(argzerosn=argtoconststr("gline", ctx, argv[0], &argzerop))) {
+ free(localdata);
+ return NULL;
}
- else { /* reason specified */
- localdata->duration = NSGLINE_DURATION;
- p = argv[0];
- if(*p == '\"')
- p++;
- len = strlcpy(localdata->reason, p, sizeof(localdata->reason));
- if(len >= sizeof(localdata->reason)) {
- localdata->reason[sizeof(localdata->reason)-1] = '\0';
+ if(argc == 1) {
+ durationp = reasonp = NULL;
+ durationsn = reasonsn = NULL;
+
+ /* if we have a space it's a reason */
+ if(strchr(argzerop, ' ')) {
+ reasonsn = argzerosn;
+ reasonp = argzerop;
} else {
- localdata->reason[len-1] = '\0';
+ durationsn = argzerosn;
+ durationp = argzerop;
}
+ } else {
+ durationsn = argzerosn;
+ durationp = argzerop;
+
+ if (!(reasonsn=argtoconststr("gline", ctx, argv[1], &reasonp))) {
+ durationsn->free(ctx, durationsn);
+ free(localdata);
+ return NULL;
+ }
+ }
+
+ if(!reasonp) {
+ strlcpy(localdata->reason, defaultreason, sizeof(localdata->reason));
+ } else {
+ strlcpy(localdata->reason, reasonp, sizeof(localdata->reason));
+ reasonsn->free(ctx, reasonsn);
}
- break;
- case 2:
- localdata->duration = durationtolong(argv[0]);
- /* error checking on gline duration */
- if (localdata->duration == 0)
+ if(!durationp) {
localdata->duration = NSGLINE_DURATION;
-
- p = argv[1];
- if(*p == '\"')
- p++;
- len = strlcpy(localdata->reason, p, sizeof(localdata->reason));
- if(len >= sizeof(localdata->reason)) {
- localdata->reason[sizeof(localdata->reason)-1] = '\0';
} else {
- localdata->reason[len-1] = '\0';
+ localdata->duration = durationtolong(durationp);
+ durationsn->free(ctx, durationsn);
+
+ if (localdata->duration == 0) {
+ parseError = "gline duration invalid.";
+ free(localdata);
+ return NULL;
+ }
}
-
- break;
- default:
- free(localdata);
- parseError = "gline: invalid number of arguments";
- return NULL;
}
if (!(thenode=(struct searchNode *)malloc(sizeof (struct searchNode)))) {
if (ctx->searchcmd == reg_chansearch) {
cip = (chanindex *)theinput;
cip->marker = localdata->marker;
- localdata->count += cip->channel->users->totalusers;
+ if (cip->channel != NULL)
+ localdata->count += cip->channel->users->totalusers;
}
else {
np = (nick *)theinput;
return (void *)1;
}
+static int glineuser(nick *np, struct gline_localdata *localdata, time_t ti) {
+ char msgbuf[512];
+ if (!IsOper(np) && !IsService(np) && !IsXOper(np)) {
+ nssnprintf(msgbuf, sizeof(msgbuf), localdata->reason, np);
+ if (np->host->clonecount <= NSMAX_GLINE_CLONES)
+ irc_send("%s GL * +*@%s %u %jd :%s", mynumeric->content, IPtostr(np->p_ipaddr), localdata->duration, (intmax_t)ti, msgbuf);
+ else
+ irc_send("%s GL * +%s@%s %u %jd :%s", mynumeric->content, np->ident, IPtostr(np->p_ipaddr), localdata->duration, (intmax_t)ti, msgbuf);
+ return 1;
+ }
+
+ return 0;
+}
+
void gline_free(searchCtx *ctx, struct searchNode *thenode) {
struct gline_localdata *localdata;
nick *np, *nnp;
chanindex *cip, *ncip;
int i, j, safe=0;
- char msgbuf[512];
time_t ti = time(NULL);
localdata = thenode->localdata;
continue;
if ((np=getnickbynumeric(cip->channel->users->content[j]))) {
- if (!IsOper(np) && !IsService(np) && !IsXOper(np)) {
- nssnprintf(msgbuf, sizeof(msgbuf), localdata->reason, np);
- if (np->host->clonecount <= NSMAX_GLINE_CLONES)
- irc_send("%s GL * +*@%s %u %jd :%s", mynumeric->content, IPtostr(np->p_ipaddr), localdata->duration, (intmax_t)ti, msgbuf);
- else
- irc_send("%s GL * +%s@%s %u %jd :%s", mynumeric->content, np->ident, IPtostr(np->p_ipaddr), localdata->duration, (intmax_t)ti, msgbuf);
- }
- else
+ if(!glineuser(np, localdata, ti))
safe++;
}
}
for (np=nicktable[i];np;np=nnp) {
nnp = np->next;
if (np->marker == localdata->marker) {
- if (!IsOper(np) && !IsService(np) && !IsXOper(np)) {
- nssnprintf(msgbuf, sizeof(msgbuf), localdata->reason, np);
- if (np->host->clonecount <= NSMAX_GLINE_CLONES)
- irc_send("%s GL * +*@%s %u %jd :%s", mynumeric->content, IPtostr(np->p_ipaddr), localdata->duration, (intmax_t)ti, msgbuf);
- else
- irc_send("%s GL * +%s@%s %u %jd :%s", mynumeric->content, np->ident, IPtostr(np->p_ipaddr), localdata->duration, (intmax_t)ti, msgbuf);
- }
- else
- safe++;
+ if(!glineuser(np, localdata, ti))
+ safe++;
}
}
}