From 34fa29bd0628bd85b6ab9b0720e21fa7d162cb68 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Sat, 23 Mar 2013 08:38:43 +0200 Subject: [PATCH] Revert "conf-parser: Remove redundant feof() call" This reverts commit 6733caf114d0d759590459745c864aa9518d133d. Apparently, the EOF bit gets set only after there has been an attempt to read more data than the file contains, so just reading the last byte isn't sufficient. --- src/pulsecore/conf-parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c index 0c7444d7..062fa8e5 100644 --- a/src/pulsecore/conf-parser.c +++ b/src/pulsecore/conf-parser.c @@ -185,6 +185,9 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, pa_p while (!feof(f)) { if (!fgets(state.buf, sizeof(state.buf), f)) { + if (feof(f)) + break; + pa_log_warn("Failed to read configuration file '%s': %s", filename, pa_cstrerror(errno)); goto finish; } -- 2.39.2