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
Show Stats 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 "config.h"
#include "TextInputStream.hxx" #include "TextInputStream.hxx"
#include "InputStream.hxx" #include "InputStream.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"
@ -37,8 +36,9 @@ TextInputStream::ReadBufferedLine()
buffer.Consume(newline + 1 - r.data); buffer.Consume(newline + 1 - r.data);
char *end = StripRight(r.data, newline); if (newline > r.data && newline[-1] == '\r')
*end = 0; --newline;
*newline = 0;
return r.data; return r.data;
} }

4
src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
View File

@ -104,13 +104,15 @@ DetachedSong *
ExtM3uPlaylist::NextSong() ExtM3uPlaylist::NextSong()
{ {
Tag tag; Tag tag;
const char *line_s; char *line_s;
do { do {
line_s = tis.ReadLine(); line_s = tis.ReadLine();
if (line_s == nullptr) if (line_s == nullptr)
return nullptr; return nullptr;
StripRight(line_s);
if (StringStartsWith(line_s, "#EXTINF:")) { if (StringStartsWith(line_s, "#EXTINF:")) {
tag = extm3u_parse_tag(line_s + 8); tag = extm3u_parse_tag(line_s + 8);
continue; continue;

4
src/playlist/plugins/M3uPlaylistPlugin.cxx
View File

@ -45,14 +45,14 @@ m3u_open_stream(InputStream &is)
DetachedSong * DetachedSong *
M3uPlaylist::NextSong() M3uPlaylist::NextSong()
{ {
const char *line_s; char *line_s;
do { do {
line_s = tis.ReadLine(); line_s = tis.ReadLine();
if (line_s == nullptr) if (line_s == nullptr)
return nullptr; return nullptr;
line_s = StripLeft(line_s); line_s = Strip(line_s);
} while (line_s[0] == '#' || *line_s == 0); } while (line_s[0] == '#' || *line_s == 0);
return new DetachedSong(line_s); return new DetachedSong(line_s);