summaryrefslogtreecommitdiff
path: root/apps/misc.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2011-06-20 15:53:33 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2011-06-20 15:53:33 +0000
commitf2ef42c1da977402e19e6ac77165f9cd0fd25643 (patch)
treee754ee56e727aa3f2741f820ffc3f6a22aa368ca /apps/misc.c
parentc56cca261a4e8a72443a3fdf79152782c7c731e5 (diff)
downloadrockbox-f2ef42c1da977402e19e6ac77165f9cd0fd25643.zip
rockbox-f2ef42c1da977402e19e6ac77165f9cd0fd25643.tar.gz
rockbox-f2ef42c1da977402e19e6ac77165f9cd0fd25643.tar.bz2
rockbox-f2ef42c1da977402e19e6ac77165f9cd0fd25643.tar.xz
Fixed a changelog export/import problem with tagcache where <CR> or <LF>
characters in a tag could cause the parser fail to import a track statistics correctly. Now line feeds are escaped properly and carriage returns ignored on import. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30021 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/misc.c')
-rw-r--r--apps/misc.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/apps/misc.c b/apps/misc.c
index 12aaf08..68775b3 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -184,15 +184,7 @@ int fast_readline(int fd, char *buf, int buf_size, void *parameters,
if (rc >= 0)
buf[pos+rc] = '\0';
- if ( (p = strchr(buf, '\r')) != NULL)
- {
- *p = '\0';
- next = ++p;
- }
- else
- p = buf;
-
- if ( (p = strchr(p, '\n')) != NULL)
+ if ( (p = strchr(buf, '\n')) != NULL)
{
*p = '\0';
next = ++p;