summaryrefslogtreecommitdiffstats
path: root/apps/tagtree.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2011-06-23 20:22:00 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2011-06-23 20:22:00 +0000
commitd0084ffd7a4a8f14aeb2c702de5794e36ffff6e8 (patch)
treeaba59da5a367fb2b00ae81c1935e2fb53ff68b57 /apps/tagtree.c
parent7ba8871d5b6606824df5c732591e50a3c378eb33 (diff)
downloadrockbox-d0084ffd7a4a8f14aeb2c702de5794e36ffff6e8.tar.gz
rockbox-d0084ffd7a4a8f14aeb2c702de5794e36ffff6e8.tar.bz2
rockbox-d0084ffd7a4a8f14aeb2c702de5794e36ffff6e8.zip
Fixed a regression caused in r30021: tagnavi_custom.config parsing
fails if lines ended with <CR><LF> sequence. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30058 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tagtree.c')
-rw-r--r--apps/tagtree.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 653fd6be93..3df8d9db2b 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -852,15 +852,21 @@ bool tagtree_import(void)
static bool parse_menu(const char *filename);
-static int parse_line(int n, const char *buf, void *parameters)
+static int parse_line(int n, char *buf, void *parameters)
{
char data[256];
int variable;
static bool read_menu;
int i;
+ char *p;
(void)parameters;
+ /* Strip possible <CR> at end of line. */
+ p = strchr(buf, '\r');
+ if (p != NULL)
+ *p = '\0';
+
logf("parse:%d/%s", n, buf);
/* First line, do initialisation. */