devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

use strlcat() instead of snprintf in the playlist viewer, and fix it so it will show the whole playlist if it would fit in the viewport (instead of missing the last item)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25660 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-04-17 11:41:01 +00:00
parent c7815abb52
commit bc18c89434
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/gui/skin_engine/skin_display.c
View file

@ -196,10 +196,9 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
struct mp3entry id3; struct mp3entry id3;
#endif #endif
char buf[MAX_PATH*2], tempbuf[MAX_PATH]; char buf[MAX_PATH*2], tempbuf[MAX_PATH];
unsigned int buf_used = 0;
gwps->display->set_viewport(viewer->vp); gwps->display->set_viewport(viewer->vp);
for(i=start_item; (i-start_item)<lines && i<playlist_amount(); i++) for(i=start_item; (i-start_item)<lines && i<=playlist_amount(); i++)
{ {
if (i == cur_playlist_pos) if (i == cur_playlist_pos)
{ {
@ -223,9 +222,9 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
int line = pid3 ? TRACK_HAS_INFO : TRACK_HAS_NO_INFO; int line = pid3 ? TRACK_HAS_INFO : TRACK_HAS_NO_INFO;
int j = 0, cur_string = 0; int j = 0, cur_string = 0;
char *filename = playlist_peek(i-cur_playlist_pos); char *filename = playlist_peek(i-cur_playlist_pos);
unsigned int line_len = 0;
buf[0] = '\0'; buf[0] = '\0';
buf_used = 0; while (j < viewer->lines[line].count && line_len < sizeof(buf))
while (j < viewer->lines[line].count && (buf_used<sizeof(buf)))
{ {
const char *out = NULL; const char *out = NULL;
token.type = viewer->lines[line].tokens[j]; token.type = viewer->lines[line].tokens[j];
@ -234,8 +233,7 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
out = get_id3_token(&token, pid3, tempbuf, sizeof(tempbuf), -1, NULL); out = get_id3_token(&token, pid3, tempbuf, sizeof(tempbuf), -1, NULL);
if (out) if (out)
{ {
snprintf(&buf[buf_used], sizeof(buf)-buf_used, "%s", out); line_len = strlcat(buf, out, sizeof(buf));
buf_used += strlen(out);
j++; j++;
continue; continue;
} }
@ -270,8 +268,7 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
} }
if (tempbuf[0]) if (tempbuf[0])
{ {
snprintf(&buf[buf_used], sizeof(buf)-buf_used, "%s", tempbuf); line_len = strlcat(buf, tempbuf, sizeof(buf));
buf_used += strlen(tempbuf);
} }
j++; j++;
} }