From: Tanu Kaskinen <tanuk@iki.fi>
Date: Sat, 23 Mar 2013 06:38:43 +0000 (+0200)
Subject: Revert "conf-parser: Remove redundant feof() call"
X-Git-Tag: v3.99.1~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34fa29bd0628bd85b6ab9b0720e21fa7d162cb68;p=platform%2Fupstream%2Fpulseaudio.git

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.
---

diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c
index 0c7444d..062fa8e 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;
         }