oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

TextInputStream: don't strip

Browse Source 
Let the caller decide whether to strip.  Only remove \n and \r
(end-of-line markers).
This commit is contained in:
Max Kellermann
2014-08-07 16:45:43 +02:00
parent 67958f7fa7
commit 1ca8d7ad45
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/input/TextInputStream.cxx
View File

@@ -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;
}