From 3dc38c0c22a919f127ae5bd31e84182e873feb77 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 11 Oct 2015 08:53:24 +0200 Subject: [PATCH] Fixed msg_fparse() for correct handling of empty lines and superfluous whitespaces --- server/src/file.c | 2 +- server/src/msg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/file.c b/server/src/file.c index ab60bacf1..299793633 100644 --- a/server/src/file.c +++ b/server/src/file.c @@ -231,7 +231,7 @@ int file_read(struct node *n, struct msg *pool, int poolsize, int first, int cnt values = msg_fscan(f->in, cur, &flags, NULL); if (values < 0) { if (!feof(f->in)) - warn("Failed to parse file of node '%s", n->name); + warn("Failed to parse file of node '%s': reason=%d", n->name, values); return 0; } diff --git a/server/src/msg.c b/server/src/msg.c index c8371b45e..837bd75a6 100644 --- a/server/src/msg.c +++ b/server/src/msg.c @@ -94,7 +94,7 @@ skip: if (fgets(line, sizeof(line), f) == NULL) return -1; /* An error occured */ /* Skip whitespaces, empty and comment lines */ - for (ptr = line; isblank(*ptr); ptr++); + for (ptr = line; isspace(*ptr); ptr++); if (*ptr == '\0' || *ptr == '#') goto skip;