aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/TextInputStream.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-10-28 22:10:47 +0100
committerMax Kellermann <max@duempel.org>2014-10-28 22:10:47 +0100
commit217d88f21f11236478dd41c37b67bef5b0a06497 (patch)
tree84cb55217dea328cbc4e3e9ae3157182509825a7 /src/input/TextInputStream.cxx
parent394e3be482ed492e5d90222dab828c2448fbccce (diff)
downloadmpd-217d88f21f11236478dd41c37b67bef5b0a06497.tar.gz
mpd-217d88f21f11236478dd41c37b67bef5b0a06497.tar.xz
mpd-217d88f21f11236478dd41c37b67bef5b0a06497.zip
TextInputStream: don't ignore unterminated last line
Diffstat (limited to 'src/input/TextInputStream.cxx')
-rw-r--r--src/input/TextInputStream.cxx20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx
index b79f64bdc..5a8dcc065 100644
--- a/src/input/TextInputStream.cxx
+++ b/src/input/TextInputStream.cxx
@@ -38,8 +38,8 @@ TextInputStream::ReadLine()
while (true) {
auto dest = buffer.Write();
if (dest.size < 2) {
- /* end of file (or line too long): terminate
- the current line */
+ /* line too long: terminate the current
+ line */
assert(!dest.IsEmpty());
dest[0] = 0;
@@ -66,7 +66,19 @@ TextInputStream::ReadLine()
if (line != nullptr)
return line;
- if (nbytes == 0)
- return nullptr;
+ if (nbytes == 0) {
+ /* end of file: see if there's an unterminated
+ line */
+
+ dest = buffer.Write();
+ assert(!dest.IsEmpty());
+ dest[0] = 0;
+
+ auto r = buffer.Read();
+ buffer.Clear();
+ return r.IsEmpty()
+ ? nullptr
+ : r.data;
+ }
}
}