X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdirplex%2Fconf.c;h=9ae4ca702f67fcd00bc09eb3b89634e21f9b374e;hb=f728df60f33dd8390f13f987ae5e30421cc34e15;hp=76624a7644a3e050be3734b8061c350ba8a601e3;hpb=257cd4a2bfad06198e9b0fb0e01476e1f65eff24;p=ashd.git diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c index 76624a7..9ae4ca7 100644 --- a/src/dirplex/conf.c +++ b/src/dirplex/conf.c @@ -86,6 +86,8 @@ static void freeconfig(struct config *cf) freeca(cf->index); if(cf->capture != NULL) free(cf->capture); + if(cf->reparse != NULL) + free(cf->reparse); free(cf); } @@ -255,9 +257,7 @@ struct config *readconfig(char *file) cf->patterns = pat; } else if(!strcmp(s->argv[0], "index-file")) { freeca(cf->index); - cf->index = NULL; - if(s->argc > 1) - cf->index = cadup(s->argv + 1); + cf->index = cadup(s->argv + 1); } else if(!strcmp(s->argv[0], "capture")) { if(s->argc < 2) { flog(LOG_WARNING, "%s:%i: missing argument to capture declaration", s->file, s->lno); @@ -269,6 +269,17 @@ struct config *readconfig(char *file) cf->caproot = 0; if((s->argc > 2) && strchr(s->argv[2], 'D')) cf->caproot = 1; + } else if(!strcmp(s->argv[0], "reparse")) { + if(s->argc < 2) { + flog(LOG_WARNING, "%s:%i: missing argument to reparse declaration", s->file, s->lno); + continue; + } + if(cf->reparse != NULL) + free(cf->reparse); + cf->reparse = sstrdup(s->argv[1]); + cf->parsecomb = 0; + if((s->argc > 2) && strchr(s->argv[2], 'c')) + cf->parsecomb = 1; } else if(!strcmp(s->argv[0], "eof")) { break; } else {