diff options
| -rw-r--r-- | conf-parser.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/conf-parser.c b/conf-parser.c index 2f013e3f24..0388a24bcc 100644 --- a/conf-parser.c +++ b/conf-parser.c @@ -13,6 +13,7 @@ #include "log.h" #define COMMENTS "#;\n" +#define NEWLINES "\n\r" #define LINE_MAX 4096 /* Run the user supplied parser for an assignment */ @@ -77,16 +78,19 @@ static char *strip(char *s) { /* Parse a variable assignment line */ static int parse_line(const char *filename, unsigned line, char **section, const char* const * sections, const ConfigItem *t, char *l, void *userdata) { - char *e, *c, *b; + char *e, *b, *c; b = l+strspn(l, WHITESPACE); - if ((c = strpbrk(b, COMMENTS))) + if ((c = strpbrk(b, NEWLINES))) *c = 0; if (!*b) return 0; + if (strchr(COMMENTS, *b)) + return 0; + if (startswith(b, ".include ")) { char *path = NULL, *fn; int r; |