dirplex: Actually allow zero-argument index-file, as documented.

[ashd.git] / src / dirplex / conf.c

diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c
index 95f643a..359bf0c 100644 (file)
--- a/src/dirplex/conf.c
+++ b/src/dirplex/conf.c
@@ -255,9 +255,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);
@@ -266,9 +264,9 @@ struct config *readconfig(char *file)
            if(cf->capture != NULL)
                free(cf->capture);
            cf->capture = sstrdup(s->argv[1]);
-           cf->caproot = 1;
-           if((s->argc > 2) && strchr(s->argv[2], 'R'))
-               cf->caproot = 0;
+           cf->caproot = 0;
+           if((s->argc > 2) && strchr(s->argv[2], 'D'))
+               cf->caproot = 1;
        } else if(!strcmp(s->argv[0], "eof")) {
            break;
        } else {