From 1ca8d7ad4527b228a4f2f25409ce5e939a14141c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 7 Aug 2014 16:45:43 +0200 Subject: TextInputStream: don't strip Let the caller decide whether to strip. Only remove \n and \r (end-of-line markers). --- src/input/TextInputStream.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/input') diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx index 0eb5bc1a8..1c46c2f2c 100644 --- a/src/input/TextInputStream.cxx +++ b/src/input/TextInputStream.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "TextInputStream.hxx" #include "InputStream.hxx" -#include "util/StringUtil.hxx" #include "util/Error.hxx" #include "Log.hxx" @@ -37,8 +36,9 @@ TextInputStream::ReadBufferedLine() buffer.Consume(newline + 1 - r.data); - char *end = StripRight(r.data, newline); - *end = 0; + if (newline > r.data && newline[-1] == '\r') + --newline; + *newline = 0; return r.data; } -- cgit v1.2.3