Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a changelog export/import problem with tagcache where <CR> or <LF>

Browse source 
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
This commit is contained in:
Miika Pekkarinen 2011-06-20 15:53:33 +00:00
parent c56cca261a
commit f2ef42c1da
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/misc.c
View file

@ -184,15 +184,7 @@ int fast_readline(int fd, char *buf, int buf_size, void *parameters,
if (rc >= 0) if (rc >= 0)
buf[pos+rc] = '\0'; buf[pos+rc] = '\0';
if ( (p = strchr(buf, '\r')) != NULL) if ( (p = strchr(buf, '\n')) != NULL)
{
*p = '\0';
next = ++p;
}
else
p = buf;
if ( (p = strchr(p, '\n')) != NULL)
{ {
*p = '\0'; *p = '\0';
next = ++p; next = ++p;

34
apps/tagcache.c
View file

@ -3278,6 +3278,13 @@ static bool write_tag(int fd, const char *tagstr, const char *datastr)
if (*datastr == '"' || *datastr == '\\') if (*datastr == '"' || *datastr == '\\')
buf[i++] = '\\'; buf[i++] = '\\';
else if (*datastr == '\n')
{
buf[i++] = '\\';
buf[i] = 'n';
continue;
}
buf[i] = *(datastr++); buf[i] = *(datastr++);
} }
@ -3335,12 +3342,18 @@ static bool read_tag(char *dest, long size,
if (*src == '\\') if (*src == '\\')
{ {
dest[pos] = *(src+1); src++;
src += 2; if (*src == 'n')
dest[pos] = '\n';
else
dest[pos] = *src;
src++;
continue; continue;
} }
dest[pos] = *src; if (*src == '\0')
break;
if (*src == '"') if (*src == '"')
{ {
@ -3348,10 +3361,7 @@ static bool read_tag(char *dest, long size,
break; break;
} }
if (*src == '\0') dest[pos] = *(src++);
break;
src++;
} }
dest[pos] = '\0'; dest[pos] = '\0';
@ -3377,10 +3387,10 @@ static int parse_changelog_line(int line_n, const char *buf, void *parameters)
if (*buf == '#') if (*buf == '#')
return 0; return 0;
logf("%d/%s", line_n, buf); /* logf("%d/%s", line_n, buf); */
if (!read_tag(tag_data, sizeof tag_data, buf, "filename")) if (!read_tag(tag_data, sizeof tag_data, buf, "filename"))
{ {
logf("filename missing"); logf("%d/filename missing", line_n);
logf("-> %s", buf); logf("-> %s", buf);
return 0; return 0;
} }
@ -3388,13 +3398,13 @@ static int parse_changelog_line(int line_n, const char *buf, void *parameters)
idx_id = find_index(tag_data); idx_id = find_index(tag_data);
if (idx_id < 0) if (idx_id < 0)
{ {
logf("entry not found"); logf("%d/entry not found", line_n);
return 0; return 0;
} }
if (!get_index(masterfd, idx_id, &idx, false)) if (!get_index(masterfd, idx_id, &idx, false))
{ {
logf("failed to retrieve index entry"); logf("%d/failed to retrieve index entry", line_n);
return 0; return 0;
} }
@ -3402,7 +3412,7 @@ static int parse_changelog_line(int line_n, const char *buf, void *parameters)
if (idx.flag & FLAG_DIRTYNUM) if (idx.flag & FLAG_DIRTYNUM)
return 0; return 0;
logf("import: %s", tag_data); logf("%d/import: %s", line_n, tag_data);
idx.flag |= FLAG_DIRTYNUM; idx.flag |= FLAG_DIRTYNUM;
for (i = 0; i < (long)(sizeof(import_tags)/sizeof(import_tags[0])); i++) for (i = 0; i < (long)(sizeof(import_tags)/sizeof(import_tags[0])); i++)