don't allow comments at the end of lines

This commit is contained in:
Lennart Poettering 2010-01-27 05:30:38 +01:00
parent 48e11fe880
commit 1ea86b1803
1 changed files with 6 additions and 2 deletions

View File

@ -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;